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=1793209480; b=VQSVEVKgil+L9ntBbyLbiHIfrRB1DRJaz/bsLnuevcyNcNBqwl+PeW6Y+RYbD9HY6xh0 YOzxmMCFJnYK4zm4tkgrZmSX3/Z+nIS1ZjYqwX/qEFkE/8+mxRcaNj+uaifOIIj+d//mA IK6s0rzWmkTwWDJrQK2zPwqe31XCzwPBRSxXMEHBLBXJll9J5SF9X2yHLAeRuPrjJCYrm TLaajo66BSXMHbHdrnNDUJ3wdhSq/CxMVZiLYMr92+OD6eSMCxObt4x1b9Ay8AnvydIyJ 1AkA7ZpyZvnWJWO91rrWSKcMUTq1AC5+vcnG+uxhwKQPy+8G7tJ8Qg9OsqSvH1YRQAg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793209480; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=HJDHrEWwOXXeU1aQG/kNje4mzbFhqQRAhZt024CCZbY=; b=GGeDcIaEotFqC3IUm7StkfCK7/0iQfrckdfscSD7aYOCh9IyQ2ZrkXVftAAZdnF//AK7 HlAVLi04gg3PF43N1KAnDoZIJI/a8eLBc+GXCCs8xFrud63fCL2y3HNqBEwfd9D+WdrIM ZYfWWfkk4ZaZoG4D7fB0orLAdzfv2un0yad2vQWE2E5wTRK1y8CoCj4PQbeh7FfnzkL4e Hh5f5jStYOO6KZ8eyS0QToXVzFGHa73Q2SACA6XsHV2X0a8+d51iPhd+9w99S7t/k7xk9 XxJmRWW3L9l8Y5ezGs0p1/o0ILGq1gy4zM/wcw+6WwlOX85EGdHFAUmnM41VXzzNHQw== 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=vX77r4Qz; 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 84943606A324; Wed, 28 Oct 2026 17:44:40 +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=vX77r4Qz Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC3501F01828; Wed, 28 Oct 2026 17:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793209480; bh=HJDHrEWwOXXeU1aQG/kNje4mzbFhqQRAhZt024CCZbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vX77r4QzNhJdTRpTc/6aKIcVR8dON9EPqbcXo1mjJLPufLHWpsx3KsdyXjg6PWSwJ BvuYEoclZ7bNGqEl00jy2QK4iUR7CyV4ARSe3N5iCV/IQyCFXmcOvWhngviPjuzuGY f+XAUbQJJ73XHe1BnlrM/CrGfH51p/gVHNg+E/Kg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Dae R. Jeong" , AutonomousCodeSecurity@microsoft.com, "Cen Zhang (Microsoft)" , Bradley Morgan , "Christian Brauner (Amutable)" , Sasha Levin Subject: [PATCH 5.10 486/516] watch_queue: Fix note pool publication race in watch_queue_set_size() Date: Wed, 28 Oct 2026 18:00:38 +0100 Message-ID: <20261028170014.991136929@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170003.522232767@linuxfoundation.org> References: <20261028170003.522232767@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cen Zhang (Microsoft) [ Upstream commit 5e531d62f1f8834faf7a4eed0d41105cf6570a8f ] 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) [ sashal: retained the existing mask variable when adding nr_notes to the local declaration ] Signed-off-by: Sasha Levin --- kernel/watch_queue.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c index 37da8647b4ecb..978c29b1fa427 100644 --- a/kernel/watch_queue.c +++ b/kernel/watch_queue.c @@ -102,7 +102,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, mask, note, offset, len; + unsigned int head, tail, mask, note, offset, len, nr_notes; bool done = false; if (!pipe) @@ -116,8 +116,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]; @@ -305,7 +307,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: -- 2.53.0