From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=103.168.172.154 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794871171; b=sxQpHghpoHSgZmqYCnrf5ZETcs2a/sTfvJa67pl5LYeP0cU9PZVgCLwX1qXbIokymfmo 1HO0sb0SpT95FjXrQ0pKKDELGEdqBs2GbLd3yT2BMZ+2D7pxc1yhQhx2EUhCNE5/5z+6n kEWyVyb3ZTiMU1YbWcEiG9PGKl8LMRJAQ17TCP0j0MmIV92KfzI7VeNALNSFYF+7sztnX EkKu1rE1Zen/fFSaxFrpoclrBxxArJlkYs6saUEAEOfGhk0oy2vL5jHkoOqe35wNqV/z5 XN3xK+/mZGvWa7vxSSL/zOWf2isKGfE6KGzJXguJOWAMNEZ782/vRfdbdyfEACvkGug== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794871171; h=DMARC-Filter:Received:Received:DKIM-Signature:DKIM-Signature: X-DKIM2-Info:DKIM2-Signature:X-DKIM2-Info:Message-Instance: X-ME-Sender:X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID: Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; bh=3mi2MURLq2D9TIEmt+9IdF6d4vDvoX02siG9m/EXZ/Q=; b=jScSp+CMDRrACK6Ob3oYGG9pGg2XjszAYOejOzm8L9XSD601ogic3VXEkIsoGRWmSLAd JA6KK27Peq+rTU0XpAZGXRXhMSVlobAWMA2BDXAA24TYejpmoK4rXhdI/N06Ov/t0+TQh gNYYIy5XrKUuWowTvi+0PVT7JkLYBzgjYI2IuJV56O3F+QvkURxLIFMUd1Kacld/Hcrw3 am6y8JpoRBY/CpjLUImHT9mrTIfp3YNaEhnL3N7cC6wex8gGRAXGxiFS0dAXKRUfind3A dy/TqCQ3MZxZMBn0T/4iZvTWiCi4c7WKhZUsA259cA77lH8Ei8so92JhAu3srQIEEcw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=fastmail.org; spf=pass smtp.mailfrom=fastmail.org; dkim=pass header.d=fastmail.org header.i=@fastmail.org header.a=rsa-sha256 header.s=fm3 header.b=oDdQA7LW; dkim=pass header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=YtYuZmgC; arc=none smtp.remote-ip=103.168.172.154 Received: from fhigh-a3-smtp.messagingengine.com (fhigh-a3-smtp.messagingengine.com [103.168.172.154]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A51E606A31C for ; Mon, 16 Nov 2026 23:19:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4A51E606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=fastmail.org header.i=@fastmail.org header.a=rsa-sha256 header.s=fm3 header.b=oDdQA7LW; dkim=pass (2048-bit key, unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=YtYuZmgC Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 5A30C14000C1 for ; Mon, 16 Nov 2026 18:19:29 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 16 Nov 2026 18:19:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1794871169; x=1794957569; bh=3mi2MURLq2D9TIEmt+9Id F6d4vDvoX02siG9m/EXZ/Q=; b=oDdQA7LWbhN0QhIsXgBZiOWEbwKIHKtrymJOa IqkCI+MjeWAc+R3daAeoHXGHs0G031/Fn++YxjXZISFoFb1BZBse4+tTTNel59cu RB686NXi6UlUlUiwQ0A18b3VG7MGaBAYZyoQp9ieimSUP5bUFVFbAbgSbX5HF9zr Gphuhw+DNoN9YzESHWVfVRvgKzh+bUAMSdSjZ4hHZspT8FfmyiOteg4YITDajtDT 4Gew16y6uP0yH3/m/KsEcy1Av37xlvIarH1NHwU29wTO2xSn9Obldm4J0Pn5S0r1 FBNtXY6W+0LxKNTSIHE0/x2efSAuq1ucKHr7tJHNwz9SHzixQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1794871169; x=1794957569; bh=3mi2MURLq2D9TIEmt+9IdF6d4vDvoX02siG 9m/EXZ/Q=; b=YtYuZmgCF08Rm1tZ3cHREAeKNFcElzeb8YY97NfZx2xov74QNi+ NvAla9b7AxzQIVYvhT3ohMFvSnn3Xz7WC9vQMrFRx/FEAS0y0VjvSMpVfWNX2QPg 2/mJdROoHW8G5zozXux1A1LzO86tWIP2jGg1FUL4ODO888g6VRJsXBEIY8Tpnx+2 DjvpaoLdGBgg5Rhsg715yENe048ax48pJH6QC8J2yhQnSTfFfSy4IcvcIlz1dxkg iq0p3UGxVsczUGsf0DAvpn6kMDVrA3/HvETUzUBX05zZ3qabBCnxCxrOw3GOs/n3 3uVcHYFUhh4xTM7OUXfIQXIUA7vqLxRPw1w== X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=sign d=fastmail.org a=rsa-sha256; DKIM2-Signature: i=1; m=1; t=1794871169; d=fastmail.org; mf=PGljYkBmYXN0bWFpbC5vcmc+; rt=PGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc+; s=fm3:rsa-sha256:TWc9lkGcLkrHnr6M/cgvKRQZmv9jjrO0Sgmh5RvkAHPLLSh RdPB4OFZNrutsBne2qaN8NP6NIjlplnRjFrNkKApxg4xj2fktei+MR6m2arCE/oh ATcynU9OVfKpd+hLn71nNjcFBySFG3+95WJMuH9cv2Bq5VWtWqL/iBf3H3H8x0jR KA8ymkIpFmcDRMspPJrKD4Cu8XhuyIbxW7WdRJ+bIWoAah7TRdv59PFv7dDFxhYO iG7XOJQrsbkaUbz7fYuaOmOC3QlrMlwkXfki+I8Qon+1Q0jr8+hsrS+ARXRYurkJ mjBRrnkRLjNpO3GF1UzWao7Y6lI3RyYFBoPPJsA==; X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=mi-m=1; hc=9; hn=cc,content-transfer-encoding,date,feedback-id,from, message-id,mime-version,subject,to; Message-Instance: m=1; h=sha256:b6FQydsq1+h+6suAH3fF7YJvYhrnYOotW+K/d2iLT4Y=:dNM9bpy/xvzf6D0nJQQ3e9zQR3sDaeTN/Si/+ssW2AY=; X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEJ3CIJfA1hP7YHW35UPoQyEUprrj/QGnRwhNqllrS4EIgFkJcv7DS3V4CSaIZ4J1 4nc9AyIyYqDOm8mF88XeG+0fDyP6ODfK+HjQHDnis5nSd4+7mNmd/+C4dzhq6s07qavSgI wNBEer5Y70x3cS9X9BhlC2axmBUaVhlX3RhBUJ4yZAhTBUzVXgyE07l3OWq54fahLgeLN2 Pn2yDmw0BX1jziKOn0safIqruKK4tJxHRkq+kJ+8nutghqDX5KmT3NnAKXn5KhQgY9eYFI QzQMOK4U8l0erXoUOHIkrPx52zuF8K+WJJlFmxHpehRl7muVbngMk1QTvOF6kefQdasyVZ XKhMqf1YPePOgspFkyDAQO011IoSVzS/NNoB8tYZBl4xm3/z90oBrP5LUIcwhouq424Xeq O557Yd2qYKEZZAV21muf09/tozKIPPMD2t01dt+gv3FZUIqhuRjdMLbTUMt0v5q9I0NJje i9OnmK3ofFO6HCD5LBDvrCUxvtY+0Xh1zKp2cmx5Mx4WZ6e5HyeUmiWi5rI+6PLxlQUzz+ iyim3t8V54487D+i4rD+Zc8aiku30AJxHYB2MCViq6CIwL7CFu8EuhELBnTH7hS5Mo0L9P DxV6Scd/JT41bBPG8BI1BQJI/J9pDzmL1P1pLH+gxnG2uy5rx0DNaCi0HPkA X-ME-Proxy: Feedback-ID: ib53e4b78:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 16 Nov 2026 18:19:27 -0500 (EST) From: Ian Bridges To: linkinjeon@kernel.org Cc: senozhatsky@chromium.org, tom@talpey.com, chenxiaosong@chenxiaosong.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Ian Bridges Subject: [PATCH] ksmbd: store the security descriptor from a copy Date: Mon, 16 Nov 2026 17:19:23 -0600 Message-ID: <20261116231923.2587994-1-icb@fastmail.org> X-Mailer: git-send-email 2.47.3 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Storing a security descriptor changes the buffer passed by the caller. ksmbd_vfs_set_sd_xattr() adjusts three offsets for the on-disk format in place. For SET_INFO, and for CREATE with a security descriptor context, this modifies the client's request buffer. Current callers do not reuse the descriptor after storing it, but a later reader would find incorrect offsets. Adjust the offsets in a private copy and make the input argument const. Reject a length shorter than the descriptor header before copying it. This keeps the caller's data intact and preserves the stored format. Add a KUnit test that checks the input stays unchanged after a successful store and after a short length is rejected. Signed-off-by: Ian Bridges --- This is a cleanup. Current callers do not reuse the descriptor after storing it, so the patch fixes no bug today. Tested on ksmbd-for-next 2746a02296a7 with KASAN. Stored descriptors and security query results match the base for SET_INFO, CREATE, inheritance and default descriptors. KUnit passes with GCC and clang, and the new test detects the input changes made by the old code. smbtorture results match the base. This patch was developed with LLM assistance. fs/smb/server/tests/smbacl_kunit.c | 36 ++++++++++++++++++++++++++++++ fs/smb/server/vfs.c | 26 ++++++++++++++------- fs/smb/server/vfs.h | 2 +- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/fs/smb/server/tests/smbacl_kunit.c b/fs/smb/server/tests/smbacl_kunit.c index 39c9f8bb1ea7..37d21c10a144 100644 --- a/fs/smb/server/tests/smbacl_kunit.c +++ b/fs/smb/server/tests/smbacl_kunit.c @@ -280,10 +280,46 @@ ksmbd_smb_check_perm_dacl_maximal_boundary_test(struct kunit *test) fput(file); } +/* + * Storing a descriptor must leave the caller's buffer unchanged. + * Check both a successful store and rejection of a short length. + */ +static void ksmbd_vfs_set_sd_xattr_keeps_caller_sd_test(struct kunit *test) +{ + struct file *file; + struct smb_ntsd *pntsd, *orig; + int ntsd_size, rc; + + pntsd = build_boundary_ntsd(test, &test_owner_sid, FILE_READ_DATA, + FILE_WRITE_DATA, &ntsd_size); + KUNIT_ASSERT_NOT_NULL(test, pntsd); + orig = kunit_kmalloc(test, ntsd_size, GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, orig); + memcpy(orig, pntsd, ntsd_size); + + file = shmem_file_setup("ksmbd-kunit-sd-copy", 0, + mk_vma_flags(VMA_NORESERVE_BIT)); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, file); + + rc = ksmbd_vfs_set_sd_xattr(NULL, mnt_idmap(file->f_path.mnt), + &file->f_path, pntsd, ntsd_size); + KUNIT_EXPECT_EQ(test, 0, rc); + KUNIT_EXPECT_MEMEQ(test, pntsd, orig, ntsd_size); + + rc = ksmbd_vfs_set_sd_xattr(NULL, mnt_idmap(file->f_path.mnt), + &file->f_path, pntsd, + sizeof(struct smb_ntsd) - 1); + KUNIT_EXPECT_EQ(test, -EINVAL, rc); + KUNIT_EXPECT_MEMEQ(test, pntsd, orig, ntsd_size); + + fput(file); +} + static struct kunit_case ksmbd_smbacl_test_cases[] = { KUNIT_CASE(ksmbd_dacl_walk_must_stop_at_declared_size), KUNIT_CASE(ksmbd_smb_check_perm_dacl_boundary_test), KUNIT_CASE(ksmbd_smb_check_perm_dacl_maximal_boundary_test), + KUNIT_CASE(ksmbd_vfs_set_sd_xattr_keeps_caller_sd_test), {} }; diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c index 111321b131bb..1114f2503ea7 100644 --- a/fs/smb/server/vfs.c +++ b/fs/smb/server/vfs.c @@ -1699,7 +1699,7 @@ static struct xattr_smb_acl *ksmbd_vfs_make_xattr_posix_acl(const struct mnt_idm int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn, const struct mnt_idmap *idmap, const struct path *path, - struct smb_ntsd *pntsd, int len) + const struct smb_ntsd *pntsd, int len) { int rc; struct ndr sd_ndr = {0}, acl_ndr = {0}; @@ -1707,6 +1707,15 @@ int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn, struct xattr_smb_acl *smb_acl, *def_smb_acl = NULL; struct dentry *dentry = path->dentry; struct inode *inode = d_inode(dentry); + struct smb_ntsd *sd; + + if (len < (int)sizeof(struct smb_ntsd)) + return -EINVAL; + + /* Shift the offsets in a copy and leave the caller's SD as it is */ + sd = kmemdup(pntsd, len, KSMBD_DEFAULT_GFP); + if (!sd) + return -ENOMEM; acl.version = 4; acl.hash_type = XATTR_SD_HASH_TYPE_SHA256; @@ -1715,14 +1724,14 @@ int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn, memcpy(acl.desc, "posix_acl", 9); acl.desc_len = 10; - pntsd->osidoffset = - cpu_to_le32(le32_to_cpu(pntsd->osidoffset) + NDR_NTSD_OFFSETOF); - pntsd->gsidoffset = - cpu_to_le32(le32_to_cpu(pntsd->gsidoffset) + NDR_NTSD_OFFSETOF); - pntsd->dacloffset = - cpu_to_le32(le32_to_cpu(pntsd->dacloffset) + NDR_NTSD_OFFSETOF); + sd->osidoffset = + cpu_to_le32(le32_to_cpu(sd->osidoffset) + NDR_NTSD_OFFSETOF); + sd->gsidoffset = + cpu_to_le32(le32_to_cpu(sd->gsidoffset) + NDR_NTSD_OFFSETOF); + sd->dacloffset = + cpu_to_le32(le32_to_cpu(sd->dacloffset) + NDR_NTSD_OFFSETOF); - acl.sd_buf = (char *)pntsd; + acl.sd_buf = sd; acl.sd_size = len; sha256(acl.sd_buf, acl.sd_size, acl.hash); @@ -1765,6 +1774,7 @@ int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn, kfree(acl_ndr.data); kfree(smb_acl); kfree(def_smb_acl); + kfree(sd); return rc; } EXPORT_SYMBOL_IF_KUNIT(ksmbd_vfs_set_sd_xattr); diff --git a/fs/smb/server/vfs.h b/fs/smb/server/vfs.h index 8568184ff05b..fb184546d26b 100644 --- a/fs/smb/server/vfs.h +++ b/fs/smb/server/vfs.h @@ -164,7 +164,7 @@ int ksmbd_vfs_remove_sd_xattrs(const struct mnt_idmap *idmap, const struct path int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn, const struct mnt_idmap *idmap, const struct path *path, - struct smb_ntsd *pntsd, int len); + const struct smb_ntsd *pntsd, int len); int ksmbd_vfs_get_sd_xattr(struct ksmbd_conn *conn, const struct mnt_idmap *idmap, struct dentry *dentry, -- 2.47.3