From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C485936E476 for ; Fri, 1 May 2026 11:09:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777633742; cv=none; b=DsuNn0fvfpOxQNRWjJEilHTkSiSrDFHZ8IOt29iNViNAU3XaYI6cFDb9hpugNLKwNj1UMuauWetDb+nCgL4P7Mi0l6aCqfhV0QyFPftci/tYjyegeTOKRNZpz+wzS9+90znDQIJ9FjZKEC0mzBZWk1i0bcTEVRxvx1OsCzFHni8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777633742; c=relaxed/simple; bh=xae6siFSzhA5fKx7Mk/zSaMY8GakjR2fqal48q64wC4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=XONjG62PY5D8A/dS6drTSK3BxoaO5evIOtpUViYxG6r9ghPvD4CsKAbzXKrcWVqJtdNUUtMxbv16U/cUoQMEishdtJJtdSU9bR3Iqx0fiT9XJ5oVBGT31x6aISHXDimBfQydct/60aFHSJv/0FBUsR41vzU9gFQ4b9iZVnnAhxs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a7Iwpl/1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="a7Iwpl/1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FA4DC2BCB4; Fri, 1 May 2026 11:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777633742; bh=xae6siFSzhA5fKx7Mk/zSaMY8GakjR2fqal48q64wC4=; h=Subject:To:Cc:From:Date:From; b=a7Iwpl/1c4wrdw1GB/q00/27qg5W9TORsiwR7qaE9+GztrsL/vSor9IPv3WlDUh5q /QNhnsQpYOqnvswpE6ld+EGDo2L0RUMCX87Q4KsZcF7VY6fltsS0AxH7cHwUrS+0Wu Rw6Z6YrHv6W4Nl9pNFuUoPSlCzcTH55ijLGbfWoY= Subject: FAILED: patch "[PATCH] io_uring/poll: ensure EPOLL_ONESHOT is propagated for" failed to apply to 5.15-stable tree To: axboe@kernel.dk,azizcan.d@mileniumsec.com Cc: From: Date: Fri, 01 May 2026 13:09:00 +0200 Message-ID: <2026050100-washday-snowdrift-2968@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 1967f0b1cafdde37aa9e08e6021c14bcc484b7a5 # git commit -s git send-email --to '' --in-reply-to '2026050100-washday-snowdrift-2968@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1967f0b1cafdde37aa9e08e6021c14bcc484b7a5 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 21 Apr 2026 13:24:33 -0600 Subject: [PATCH] io_uring/poll: ensure EPOLL_ONESHOT is propagated for EPOLL_URING_WAKE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: aacf2f9f382c ("io_uring: fix req->apoll_events") fixed an issue where poll->events and req->apoll_events weren't synchronized, but then when the commit referenced in Fixes got added, it didn't ensure the same thing. If we mask in EPOLLONESHOT in the regular EPOLL_URING_WAKE path, then ensure it's done for both. Including a link to the original report below, even though it's mostly nonsense. But it includes a reproducer that does show that IORING_CQE_F_MORE is set in the previous CQE, while no more CQEs will be generated for this request. Just ignore anything that pretends this is security related in any way, it's just the typical AI nonsense. Cc: stable@vger.kernel.org Link: https://lore.kernel.org/io-uring/CAM0zi7yQzF3eKncgHo4iVM5yFLAjsiob_ucqyWKs=hyd_GqiMg@mail.gmail.com/ Reported-by: Azizcan Daştan Fixes: 4464853277d0 ("io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups") Signed-off-by: Jens Axboe diff --git a/io_uring/poll.c b/io_uring/poll.c index 6834e2db937e..0204affdc308 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -417,8 +417,10 @@ static int io_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync, * disable multishot as there is a circular dependency between * CQ posting and triggering the event. */ - if (mask & EPOLL_URING_WAKE) + if (mask & EPOLL_URING_WAKE) { poll->events |= EPOLLONESHOT; + req->apoll_events |= EPOLLONESHOT; + } /* optional, saves extra locking for removal in tw handler */ if (mask && poll->events & EPOLLONESHOT) {