From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792594128; b=egTz1D896W9ODp8gvR4Y2JGH+IGqlQ8MqO9L2P2+KZD4JYx5yRkt9ziXlxSzGu/lrI6A 6zATBFlGHjDAN5sNUpn2Kqt6jBys2vqB557Ku6z3KpPm1P/8EQ0f+XsOy0OmEpPwU6FLg sWqKovXt0AsbrvNa3PTBpFqVutsd/YCZhl5jeKs/tA22lA3YPx0qtmlmooU1wOujKS7Dk /prvb1EfZ1ZfahG8vxOUlv7Y+tIcLuUstQHK7q6ITBeDpXh6vUzIjbgKXdtWosLwPXLpe 5wkz0P/p364l2oYyleCjCmjwzLx1wRXM1Wk1v5xGENx8fwwxgSuvubXtyop9gNOV2aA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792594128; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=TMK9sKVm5sshusIofI77KQgcXJje85mGiaTPFgnqey4=; b=d6FfDjWDLv8gntK4HeACRxC6zvpXPnnzIgLUjuRbrwftQCEwJ9WD3eN1hBl8Qn1M4cXO W2JMEpsQQ16M6Es5wuU25XXgCv44kUR/817wODndSZhtlEnllGiSIY/+wxmTr/OzkgIQ4 1ETXXNBDhMplU3D7tcRT/0Fo2YQO0TmitVjDaSw98yd9EcHxbPiuXEAvTA82cIJA4cTkw POyn80/VifGQ+NkYbUCfn2aheKg0pIDbVijjOqOJCN/y1hQG5wyLE24haifb7Ty4p7sJL bLOJHsHwuHRswRqhZbimq53ff5wkKuZbaUFsbJi8AfOfrG/c/t9C/ikiHpvpYDFEdNA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=QhycHsOm; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BC65606A319 for ; Wed, 21 Oct 2026 14:48:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=QhycHsOm Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31DD71F000C1; Wed, 21 Oct 2026 14:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792594127; bh=TMK9sKVm5sshusIofI77KQgcXJje85mGiaTPFgnqey4=; h=Subject:To:Cc:From:Date; b=QhycHsOmo9CwtExkel+tbf9h6TvZMM+PhnLCNQCh2tyS52VI6OwObntWs4qB0tJpN E2lwGm1nSoZH7N+Pn3E6IOho15fmUW9cmTWISqjnuwIHFtEUN8BXnleo6tk94j9Xo8 Zdw9I6bzjmZC1GMv1XuNXC99tnEWDrBAyUGW6rPo= Subject: FAILED: patch "[PATCH] watch_queue: Fix note pool publication race in" failed to apply to 6.1-stable tree To: cenzhang@linux.microsoft.com,brads@mainlining.org,brauner@kernel.org,stable@vger.kernel.org,threeearcat@gmail.com Cc: From: Date: Wed, 21 Oct 2026 16:34:23 +0200 Message-ID: <2026102123-doze-gizzard-4a63@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x 5e531d62f1f8834faf7a4eed0d41105cf6570a8f # git commit -s git send-email --to '' --in-reply-to '2026102123-doze-gizzard-4a63@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5e531d62f1f8834faf7a4eed0d41105cf6570a8f Mon Sep 17 00:00:00 2001 From: "Cen Zhang (Microsoft)" Date: Fri, 9 Oct 2026 18:47:15 -0400 Subject: [PATCH] watch_queue: Fix note pool publication race in watch_queue_set_size() There is a race between watch_queue_set_size() and post_one_notification(). watch_queue_set_size() publishes wqueue->notes, notes_bitmap, nr_pages and nr_notes with plain stores, and post_one_notification() reads them with plain loads under a different lock, so nothing orders the four stores against the poster's loads: depending on the build, notes can be stored last (gcc 14 on x86-64 does this). Since keyctl_watch_key() lets a watch attach to a queue before it is sized, post_one_notification() can already be running on another CPU at that moment: it reads nr_notes > 0, passes its bounds check, and then reads notes while it is still NULL, dereferencing notes[0]. An unprivileged user triggers this reliably by watching one of its own keys through a notification pipe and racing ioctl(IOC_WATCH_QUEUE_SET_SIZE) on that pipe against keyctl(KEYCTL_SETPERM) on the key from another CPU, triggering: BUG: kernel NULL pointer dereference, address: 0000000000000000 RIP: 0010:post_one_notification.isra.0+0xa2/0x1e0 Call Trace: __post_watch_notification+0x148/0x180 keyctl_setperm_key+0x119/0x130 do_syscall_64+0x108/0x4c0 entry_SYSCALL_64_after_hwframe+0x77/0x7f Kernel panic - not syncing: Fatal exception in interrupt Fix this by publishing nr_notes last with smp_store_release(), and by reading it once with smp_load_acquire() in post_one_notification() before the bitmap and the page array are touched. A poster that observes a non-zero nr_notes then also observes the pool behind it; one that observes zero drops the notification as before. Fixes: c73be61cede5 ("pipe: Add general notification queue support") Reported-by: Dae R. Jeong Closes: https://lore.kernel.org/all/ZT-S8Q7tyutcvu_q@dragonet/ Reported-by: AutonomousCodeSecurity@microsoft.com Suggested-by: Dae R. Jeong Signed-off-by: Cen Zhang (Microsoft) Link: https://patch.msgid.link/20261009224715.46121-1-cenzhang@linux.microsoft.com Reviewed-by: Bradley Morgan Cc: Signed-off-by: Christian Brauner (Amutable) diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c index 538520861e8b..932a88ac1f39 100644 --- a/kernel/watch_queue.c +++ b/kernel/watch_queue.c @@ -101,7 +101,7 @@ static bool post_one_notification(struct watch_queue *wqueue, struct pipe_inode_info *pipe = wqueue->pipe; struct pipe_buffer *buf; struct page *page; - unsigned int head, tail, note, offset, len; + unsigned int head, tail, note, offset, len, nr_notes; bool done = false; spin_lock_irq(&pipe->rd_wait.lock); @@ -111,8 +111,10 @@ static bool post_one_notification(struct watch_queue *wqueue, if (pipe_full(head, tail, pipe->ring_size)) goto lost; - note = find_first_bit(wqueue->notes_bitmap, wqueue->nr_notes); - if (note >= wqueue->nr_notes) + /* Pairs with the smp_store_release() in watch_queue_set_size(). */ + nr_notes = smp_load_acquire(&wqueue->nr_notes); + note = find_first_bit(wqueue->notes_bitmap, nr_notes); + if (note >= nr_notes) goto lost; page = wqueue->notes[note / WATCH_QUEUE_NOTES_PER_PAGE]; @@ -297,7 +299,8 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes) wqueue->notes = pages; wqueue->notes_bitmap = bitmap; wqueue->nr_pages = nr_pages; - wqueue->nr_notes = nr_notes; + /* Pairs with the smp_load_acquire() in post_one_notification(). */ + smp_store_release(&wqueue->nr_notes, nr_notes); return 0; error_p: