From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 83AE96072811 for ; Wed, 4 Nov 2026 19:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GLlT6wTh Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jKb5S1zdFz2yfH; Thu, 05 Nov 2026 06:26:04 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793820364; cv=none; b=h/J60cjLsWol1Inb6fsgGgzohGj/iOBNxCOM0myIWrg6V0zXT1BnqOxflWiKoskilfcLAwvsxUJvK8K2zdQEXdtzf8K2l4XJc2vDR2NJ7O+v/vBTI9VmQA/OlTntDmQ6/EHIpMa/1m1F2IURZ4AMpfFib4BsDhwRCw0+25PlQh74RwFIJSz54Nl8EdIsnTj8KFDy80h7DyOsM7b7G5y4Xx6ITU4NKfNa5Eh/8rZG5nhoDbcuSdrxFkBi0CHx5HXOqHkB34umjpc3uqhsMQJHN1W6jaBkT3KGZDXLqu0jWvFjo0uoz46l4epqg28v/0O/1UoTvdr3mPD2TbYqvXUXzg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793820364; c=relaxed/relaxed; bh=RXd/jlD2fYO+IzUitqn0Yxqt//n2gto42+U+qSH6QWU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CqP7HdfnxbuBTfltH6N8rx61EhNldrFZh79yCLe9GpFuAEw00CFuF6XBMlKrG6ZXiQHC4J7hYavtpi1eGkXqAtIdyu3FdQpzXWUS17TbN5iM7M/2nh/QpQfycCDtU6Ijt1MTNolidnPxAxsiX/BDzi+9zngInqti5m2PUmtOfvR1Eb4jPfAKPzxlTY8HqdmbO1oZDimqZOr9mzYuSdKjWF2TwzfROX2jh3sJsokvLBFbGux0FqeWEurf/lVglmxdfKEi1ayzfeO+CkU9+/GLid4ZPJjpUNhxSB0UOnPFC9/tCufapPhIbwOanSaOfqUdxEolzDtKhcmqLRl6j46z1A== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GLlT6wTh; dkim-atps=neutral; spf=pass (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GLlT6wTh; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4jKb5R3jSYz2yb9 for ; Thu, 05 Nov 2026 06:26:03 +1100 (AEDT) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 03CA343323; Wed, 4 Nov 2026 19:26:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6879B1F000C1; Wed, 4 Nov 2026 19:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793820361; bh=RXd/jlD2fYO+IzUitqn0Yxqt//n2gto42+U+qSH6QWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GLlT6wThOUa/KfNlTWuqZPz2Ih/LW2NYnzaWY0pki30umCZLIl1MRVBbUTMv9zOzQ KUvA2Y+BaOT4XHvhY/vbdRPf/ofxl4BOA7G2Cny/691CVbfE9SzJNG0H7841ayyiPW q1QKtzy42RoQEe16QVfbQhu1Trtg8T0HfuKYvU0jeicYSNp2+ODBxjEymSq0qmh803 DkvXTDiylR93zfsmnmYdfkoSjx/mzTH9XVIFaqgxigm0SGf8nQQ7zg0Th1in/5RVHH UvwoKm7/7JzOhxW7xTQaC2jHyFnfQfIuSRDNs0GpztaoEROUElyxSGVsFyKXWU+016 ZqAQCUwnhlOrQ== From: Christian Brauner To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds , Jann Horn , Josef Bacik , Chris Mason , Jeff Layton , NeilBrown , Eric Dumazet , Thomas Gleixner , Al Viro , Jonathan Corbet , Christoph Hellwig , Greg Kroah-Hartman , Joel Granados , Kees Cook , Jan Kara , Jan Kara , linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-um@lists.infradead.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, ntfs3@lists.linux.dev, platform-driver-x86@vger.kernel.org, coreteam@netfilter.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org, netfilter-devel@vger.kernel.org, dri-devel@lists.freedesktop.org, ibm-acpi-devel@lists.sourceforge.net, jfs-discussion@lists.sourceforge.net, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linux-usb@vger.kernel.org, samba-technical@lists.samba.org, sparclinux@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-doc@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, Takashi Iwai , linux-input@vger.kernel.org, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org, linux-modules@vger.kernel.org, linux-debuggers@vger.kernel.org, "Christian Brauner (Amutable)" , Chuck Lever , stable@vger.kernel.org Subject: [PATCH RESEND v2 40/51] sunrpc: make queue_wait a global wait queue again Date: Wed, 4 Nov 2026 20:25:47 +0100 Message-ID: <20261104-work-procfs-bugfixes-v2-40-021c84d852e0@kernel.org> In-Reply-To: <20261104-work-procfs-bugfixes-v2-0-021c84d852e0@kernel.org> References: <20261104-work-procfs-bugfixes-v2-0-021c84d852e0@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=4370; i=brauner@kernel.org; h=from:subject:message-id; bh=UZe+zvZ7uAQTPHkJMC5sa/e/J7N81e8hQB7K9CX6y/s=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS9bvx78e/9TWXFnRv2n+0+Y7Bz41ZTh6+/N7u8dJn+Z vW+4nUTvnWUsjCIcTHIiimyOLSbhMst56nYbJSpATOHlQlkCAMXpwBMpO8Lw/8UM22Z1SoBq778 fmAYFTvHNOBq8s/y7Yt0nNzEbPj0c+UZGdbduHhO1LNCJf1l6qOLebn6Ed/D5rXesxVIOr3xlVR zNxcA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Since commit 552d0e17ea04 ("sunrpc: convert queue_wait from global to per-cache-detail waitqueue") poll() and epoll queue their waiters for a channel file on the queue_wait head in struct cache_detail. But the cache_detail can be freed while its channel file is still open and waited on. The procfs channel files of a network namespace are removed when the namespace goes away. Removing a procfs file waits for the callers that are in one of its methods right now and then calls ->release on every file that is still open (cf. close_pdeo()). The waiters that poll() and epoll left on the head stay queued until their file is really closed. So: sunrpc_exit_net() -> ip_map_cache_destroy() -> cache_unregister_net() -> remove_cache_proc_entries() -> proc_remove() // ->release, the waiters stay queued -> cache_destroy_net() // kfree(cd) and when poll() returns remove_wait_queue() writes to the freed cache_detail: BUG: KASAN: slab-use-after-free in _raw_spin_lock_irqsave+0x4b/0xa0 Read of size 1 at addr ff110001131bb570 by task sunrpc-poll-uaf/242 Call Trace: remove_wait_queue+0x22/0x1c0 poll_freewait+0xc2/0x230 do_sys_poll+0x9ba/0xd50 __x64_sys_poll+0x165/0x470 Freed by task 12: kfree+0x267/0x620 sunrpc_exit_net+0x34/0x80 ops_undo_list+0x271/0x8d0 cleanup_net+0x3f3/0x860 Closing an epoll instance that watches the file gets there through ep_unregister_pollwait() instead. The channel files of a network namespace belong to the root of its user namespace and cache_open() doesn't check for a capability. So an unprivileged user can open the channel file of a namespace of its own from the outside, poll it and let the namespace die. Go back to a single static wait queue that never goes away. A wakeup for one cache wakes the waiters of all caches again but cache_poll() reports per cache_detail so that's just a spurious wakeup. procfs should really own the wait queue of its files like kernfs does but that's nothing for stable. Reported-by: Chris Mason Fixes: 552d0e17ea04 ("sunrpc: convert queue_wait from global to per-cache-detail waitqueue") Acked-by: Chuck Lever Cc: stable@vger.kernel.org Signed-off-by: Christian Brauner (Amutable) --- include/linux/sunrpc/cache.h | 1 - net/sunrpc/cache.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h index 2735c332ddb7..bf4fc543e1e5 100644 --- a/include/linux/sunrpc/cache.h +++ b/include/linux/sunrpc/cache.h @@ -119,7 +119,6 @@ struct cache_detail { struct list_head requests; struct list_head readers; spinlock_t queue_lock; - wait_queue_head_t queue_wait; u64 next_seqno; atomic_t writers; /* how many time is /channel open */ diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 1bc04109d213..1ceaea7e01b9 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -404,7 +404,6 @@ void sunrpc_init_cache_detail(struct cache_detail *cd) INIT_LIST_HEAD(&cd->requests); INIT_LIST_HEAD(&cd->readers); spin_lock_init(&cd->queue_lock); - init_waitqueue_head(&cd->queue_wait); cd->next_seqno = 1; spin_lock(&cache_list_lock); cd->nextcheck = 0; @@ -965,13 +964,20 @@ out: return ret; } +/* + * Not in struct cache_detail: poll and epoll waiters stay queued until + * their file is closed, but a channel file in procfs can stay open after + * the cache_detail of its dying network namespace has been freed. + */ +static DECLARE_WAIT_QUEUE_HEAD(queue_wait); + static __poll_t cache_poll(struct file *filp, poll_table *wait, struct cache_detail *cd) { __poll_t mask; struct cache_reader *rp = filp->private_data; - poll_wait(filp, &cd->queue_wait, wait); + poll_wait(filp, &queue_wait, wait); /* alway allow write */ mask = EPOLLOUT | EPOLLWRNORM; @@ -1236,7 +1242,7 @@ static int cache_do_upcall(struct cache_detail *detail, struct cache_head *h) spin_unlock(&detail->queue_lock); if (ret != -EAGAIN && detail->cache_notify) detail->cache_notify(detail, h); - wake_up(&detail->queue_wait); + wake_up(&queue_wait); if (ret == -EAGAIN) { kfree(buf); kfree(crq); -- 2.53.0