mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ksmbd: clear DACL_PRESENT when the query omits the DACL
@ 2026-11-18 17:40 Ian Bridges
  0 siblings, 0 replies; only message in thread
From: Ian Bridges @ 2026-11-18 17:40 UTC (permalink / raw)
  To: linkinjeon
  Cc: senozhatsky, tom, chenxiaosong, linux-cifs, linux-kernel,
	Ian Bridges, stable

build_sec_desc() starts the Control of a security query reply from
SELF_RELATIVE and ORs in the Control of the stored descriptor. A stored
descriptor with a DACL has DACL_PRESENT. When the client asks only for
the owner or the group, the reply then has DACL_PRESENT set and no
DACL. A client reads DACL_PRESENT with a zero DACL offset as a NULL
DACL, not as a DACL that was left out of the reply. The server's own
access checks are not affected.

Do not take DACL_PRESENT from the stored descriptor. build_sec_desc()
already sets it when the DACL is requested.

Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3")
Cc: stable@vger.kernel.org
Signed-off-by: Ian Bridges <icb@fastmail.org>
---

Tested on ksmbd-for-next 267029b35ad1 with KASAN. On a file with a
stored descriptor, a query for the owner, the group or both now returns
Control 0x8000 instead of 0x8004. Replies for the other tested
AdditionalInformation values are unchanged. smbtorture results match
the base.

This patch was developed with LLM assistance.

 fs/smb/server/smbacl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c
index a87c22fa9a6e..5bd0c7eab515 100644
--- a/fs/smb/server/smbacl.c
+++ b/fs/smb/server/smbacl.c
@@ -1077,8 +1077,9 @@ int build_sec_desc(const struct mnt_idmap *idmap,
 	pntsd->sacloffset = 0;
 	pntsd->revision = cpu_to_le16(1);
 	pntsd->type = cpu_to_le16(SELF_RELATIVE);
+	/* DACL_PRESENT is set below when the DACL is requested */
 	if (ppntsd)
-		pntsd->type |= ppntsd->type;
+		pntsd->type |= ppntsd->type & ~cpu_to_le16(DACL_PRESENT);
 
 	if (addition_info & OWNER_SECINFO) {
 		pntsd->osidoffset = cpu_to_le32(offset);
-- 
2.47.3


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-18 17:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 17:40 [PATCH] ksmbd: clear DACL_PRESENT when the query omits the DACL Ian Bridges

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®