From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f54.google.com (mail-oo1-f54.google.com [209.85.161.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A264136D50A for ; Mon, 1 Dec 2025 20:16:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764620193; cv=none; b=FMTIXK/uQOqFgm2rLUzukhueQIWT3RxUAuMIZmI+HBf8aWJWghbcfj01YSrxxfcllHEhYCTeBrECMAUd9ExYy+gYQtAcE8YzqX0OWXTlj+t5QLHsUO6Dv3ie9NBjZIhbLC1UJRx0OHCPg01eAKGvSdA/SYxS0n/Iy5sMo9o4Qsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764620193; c=relaxed/simple; bh=VhFWams7lyRPZDIuIbaqXkF7PZRFGSeCxPXAZ364irY=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=k/RjfrFQES1USqFeIglntwE6CzByoVNODHlEjAS30IOxkIl4+xpSfAKSR/aBHsXfWfYWJYjUGlT+vrezYqMnQvf0yhgXrSWsIE++hV4q+Fw3oqDNAp69k/l+pYUpB9kJjgZvmtTq9DYdnJPvQJeCSflMk+7oK/x8PSZNhVf8v0g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=DfH3uIYW; arc=none smtp.client-ip=209.85.161.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="DfH3uIYW" Received: by mail-oo1-f54.google.com with SMTP id 006d021491bc7-65791c35134so2090058eaf.1 for ; Mon, 01 Dec 2025 12:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1764620190; x=1765224990; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=j+Oa6MGzXGAuWxl8ZtgkrmtT/6nIVLT37/yjMN3yRqs=; b=DfH3uIYW//DXmPIVCaHmePBSitE5NXIHhDSflPjKVbGhKx/Jh6XE9HbwJHER3IXRkU TYHxJhHYcPR+xtWs/vlG4yL6rqQoGEzBCNAp98wcqqJj0X+FjjrJ8dqhLGbPMVyGhg48 Gn0D5iuosLG7aeqR9zGXw5LdpOZbl0/81FwZdoxcSd5lquOtWffq4LhX/wbPEPKqJ/vM ummAsm+bP53awPqTtPimsOorx/XP3aWMwArJ0CxXF1UqoE3wFDOabwSkb+NltvFIeTHu KnvCyrQPqEZi5Gdcral/hSVeyLnCESWVsq5nS/XwJ8kHlIps4r/SpSqBVZh5pUJ+2YMp XHQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764620190; x=1765224990; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j+Oa6MGzXGAuWxl8ZtgkrmtT/6nIVLT37/yjMN3yRqs=; b=aK/p4hf81mm22Bw7gbZbzfuns2mHouvyhN8j3pWQjVdqBs7HEj5BBzc53+dVB5X2EM zoHUKyoUHOyjZcp3O/5kPLBV4fRBxK570rBQ/IToStU57FulTJta7NpvFaCGl8BIox4V VRTg+FGUMbRs3pcipTMe4vhsOK/eQ1LIq0kcU+RzhaA2o3AUkipI52acK86FBMgX4bwa gMEQRvdgjv2GBG+M2XouTzKGb7qgwABg6s4AFdcCIpQ4NzRv8JiaplO8tBZdNOsFWkjP qoCroJxkf/QfPyq8qi1RKT7wdlyL8xIMYKHJM+w8Gy8gzhUasW4/B6x+INkhmSPM8ahH +UWQ== X-Forwarded-Encrypted: i=1; AJvYcCUh7lt/cpmqva311QeFNA+UjLYKRqEL6c/3EIFs6lxVr5zOI8lat/570vrU+LnOVfuOnD/HoRuqRIptLv4=@vger.kernel.org X-Gm-Message-State: AOJu0YzweOF90/191lqaIp1955LtmpMtcL47lery+j94IAqDMk6E827I i74e8cZnumiZlySqTwQpeeIH+JCaNDQIebs9waVOzW4IN4rhATbUp3qrGkxedZs/EJY= X-Gm-Gg: ASbGnctpeaSFEmSCObmCMF7E//aUX6BO67TXaB9GmtJYZKg6uSrFujaQhl+/sFeKVbU 2BmYc5IFBmDWRoZh6S3D02iN85/K5eNN/6nPYmUEY7iTRLSEwtDPH6ws7edNUfBp6YJajXlg17f A7VM6grXvnSpEuquhgQnJQBnsgPCYFKB4tX4DR8At0pwtToCe0+PKTXfEFc3v40g4ayQLifMHZ3 Tzg5o6pP99cMM1FcAhD+xmdDHkzeORDmADBtw1zIcFfeh4pNpWS6Gk8hH7U+KQ8nFhsR4/4TcX0 ZW8OegqDHTHCUrXwXzZhPb6OFYJKdyY+Sr8PLiDhDKu3atDwpxCB/W4+cPFpB0daAirOq5Z+FOQ F5K/WV0BWqPAQ0HMlkszuQpIPqk44ATa2NkOqZ4HfqvJSBDmbtwIJjuJCmpFU2N87ClyF23op9e kzOJTXnjoXo2e404NT X-Google-Smtp-Source: AGHT+IEdqlPd+ymzbVDWhsjYlfK79/tgshfjPT6Q5sbzo9OmFt1D9j8HT9Hwl8Q4Pk8B0XIaZOSK1w== X-Received: by 2002:a05:6820:6ae1:b0:656:9202:58ca with SMTP id 006d021491bc7-657bdb961c7mr10866619eaf.3.1764620189674; Mon, 01 Dec 2025 12:16:29 -0800 (PST) Received: from [192.168.1.99] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-659332dff05sm2958698eaf.6.2025.12.01.12.16.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Dec 2025 12:16:29 -0800 (PST) Message-ID: <6fcfa902-5d59-4d2a-9fa6-ea59529f6710@kernel.dk> Date: Mon, 1 Dec 2025 13:16:28 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [syzbot] [io-uring?] memory leak in io_submit_sqes (5) To: syzbot , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com References: <692dcb58.a70a0220.2ea503.00b5.GAE@google.com> Content-Language: en-US From: Jens Axboe In-Reply-To: <692dcb58.a70a0220.2ea503.00b5.GAE@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit #syz test: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git v6.18 diff --git a/io_uring/poll.c b/io_uring/poll.c index b9681d0f9f13..5df09e4e958d 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -922,6 +922,11 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags) goto out; } + /* + * Set cancel res early, so io_poll_add() can overwrite it, if + * necessary. + */ + io_req_set_res(preq, -ECANCELED, 0); if (poll_update->update_events || poll_update->update_user_data) { /* only mask one event flags, keep behavior flags */ if (poll_update->update_events) { @@ -936,12 +941,12 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags) ret2 = io_poll_add(preq, issue_flags & ~IO_URING_F_UNLOCKED); /* successfully updated, don't complete poll request */ - if (!ret2 || ret2 == -EIOCBQUEUED) + if (ret2 == IOU_ISSUE_SKIP_COMPLETE) goto out; } - req_set_fail(preq); - io_req_set_res(preq, -ECANCELED, 0); + if (preq->cqe.res < 0) + req_set_fail(preq); preq->io_task_work.func = io_req_task_complete; io_req_task_work_add(preq); out: -- Jens Axboe