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=1793831629; b=uys8WHw0CzdfjIFJwKUMZ2ugjWNSnRNFiqMsbMVjNEAoYulPubNwjn7gQw3Sy0jVEleG tobpVur9YYdb+4RpcTEm0A4eWNVN/o1q5dNK6x3dA4nCtjuTCMSusNW04ch5G9BRi44q3 Fbm3J6E4ueYCnCEx5eXqoorGODsN6ZP9zekKB61fDUDGL4BeL3x3j3K+jwQve4Rt6t468 f2ZdxJcjNKcXOmLLroHGxZUjWDNqnAI48itBIf1mZglO0fOFqzFNdFqfX7iU2uPDoJfZs WDSYeFYmAX8tQ+6vWxI7Eh77KcYWWahM8jp6ilbLxA6pbUbpk+vYV1a6I6YUvIoZitw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793831629; 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=iN546HxixpH81VkDyx2ZQqNR8DYH/vdCIi/L9s6HUQA=; b=NXA4Lpu5mH/cgi592pUK3lbOlfkvksw8/ZK21A9vBHb8dK4Lo1S1N35TUvrbTfiWUw8W vIQgyEVCALFKyCnpGA9VzM6EslWoJkoz1Qvr3SoWpYeyVnVaXAiy96VP6nYEKsDYOaspr +CzgCTaReEBxm83z8cvJkoNrFDYQTp1gUI7yxohytr97nfnvqo0rmB/iKt1qRC+9A5Ewd +E43HAp/p4xuclh+55bk0lgK5R7O45gTxgXoi6LAdi0tLWZn0wrEfNB4HIpOKkxMSawoQ GVJw5yOySxzuDOAp1ZLzEfCSaKZjbQcVzDIaS1QN4VTtrEAKK0MhPM7xmRRkJyxw6zw== 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=PMwaFxOt; 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 E75F2606AC25; Wed, 4 Nov 2026 22:33:48 +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=PMwaFxOt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 820031F000C1; Wed, 4 Nov 2026 22:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793831628; bh=iN546HxixpH81VkDyx2ZQqNR8DYH/vdCIi/L9s6HUQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PMwaFxOt7qHp/l5qQXmmxDL8Bho1HZmmZ9aoqV1aowv+LYPXuZoV82FGDBxKs0zpq e6hUx6jr89hgDPQS0x+zC2gOifj6a3Fpy7OP3B4inul3X4tvzAapkyHQQntCEncpmT HosWx3uWGqRQUuidAIH0lyYQkD+3nnpk7D5J1qMk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yongjun Gwon , Namjae Jeon , Sasha Levin Subject: [PATCH 6.18 0820/1005] ksmbd: serialize directory emptiness checks with readdir Date: Wed, 4 Nov 2026 16:09:13 -0500 Message-ID: <20261104211106.312419730@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211043.516122098@linuxfoundation.org> References: <20261104211043.516122098@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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yongjun Gwon [ Upstream commit 7220980b2423d06a0604516129bfa4cec8a697ae ] SMB2 QUERY_DIRECTORY holds fp->readdir_lock while it calls iterate_dir() on fp->filp. An SMB2 SET_INFO request with FILE_DISPOSITION_INFORMATION can resolve the same FileId and call ksmbd_vfs_empty_dir() on the same filp without that lock. iterate_dir()'s inode read lock permits concurrent readers and does not serialize per-file iterator state. ext4 stores its dx readdir cursor and fname RB tree in file->private_data. Concurrent reset or refill can therefore free a fname node while the other worker still traverses it or retains its RB-tree link, resulting in use-after-free accesses. An authenticated SMB client with list and delete rights on a directory in a writable KSMBD share backed by ext4 can trigger this when the directory takes the dx readdir path. The client overlaps an SMB2 QUERY_DIRECTORY request with an SMB2 SET_INFO request carrying FILE_DISPOSITION_INFORMATION on one live FileId. In one x86_64 SMP KASAN multi-shot guest using ksmbd-for-next at 171df27077fb, the unmodified kernel reported a cross-worker use-after-free before a panic. The first report's access and free stacks show the two request paths directly (trimmed): BUG: KASAN: slab-use-after-free in ext4_htree_store_dirent+0x488/0x550 Read of size 8 by task kworker/2:0/29 Workqueue: ksmbd-io handle_ksmbd_work Call Trace: ext4_htree_store_dirent+0x488/0x550 htree_dirblock_to_tree+0x535/0x990 ext4_htree_fill_tree+0x319/0xba0 ext4_readdir+0x175a/0x2f40 iterate_dir+0x1b6/0x630 smb2_query_dir+0x1003/0x1cc0 Freed by task 279: free_rb_tree_fname+0x67/0xc0 ext4_readdir+0x13a9/0x2f40 iterate_dir+0x1b6/0x630 ksmbd_vfs_empty_dir+0xa2/0x100 smb2_set_info+0x2ffa/0x45d0 Take fp->readdir_lock across the entire emptiness check. This places both iterators over that handle's filp in the same lock domain while preserving the disposition status handling. The exact code change completed a warning-free x86_64 KASAN bzImage build. Tracing three request pairs showed that the two iterate_dir() calls no longer overlapped and the expected statuses were preserved. A further 1,600 reproducer iterations completed with expected statuses and no KASAN report, Oops, or panic. The reproducer and complete guest configuration are available privately to maintainers on request. Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Yongjun Gwon Signed-off-by: Namjae Jeon [ sashal: adjusted set_file_disposition_info() context for the existing directory condition and older oplock/delete-pending helpers ] Signed-off-by: Sasha Levin --- fs/smb/server/smb2pdu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 793c219b9a610..5ba6869038f3d 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -6592,6 +6592,7 @@ static int set_file_disposition_info(struct ksmbd_work *work, struct smb2_file_disposition_info *file_info) { struct inode *inode; + int err; if (!(fp->daccess & FILE_DELETE_LE)) { pr_err("no right to delete : 0x%x\n", fp->daccess); @@ -6600,9 +6601,13 @@ static int set_file_disposition_info(struct ksmbd_work *work, inode = file_inode(fp->filp); if (file_info->DeletePending) { - if (S_ISDIR(inode->i_mode) && - ksmbd_vfs_empty_dir(fp) == -ENOTEMPTY) - return -EBUSY; + if (S_ISDIR(inode->i_mode)) { + mutex_lock(&fp->readdir_lock); + err = ksmbd_vfs_empty_dir(fp); + mutex_unlock(&fp->readdir_lock); + if (err == -ENOTEMPTY) + return -EBUSY; + } smb_break_all_levII_oplock(work, fp, 0); ksmbd_set_inode_pending_delete(fp); } else { -- 2.53.0