]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
smb: client: validate the whole DACL before rewriting it in cifsacl
authorMichael Bommarito <michael.bommarito@gmail.com>
Mon, 20 Apr 2026 00:11:31 +0000 (20:11 -0400)
committerSteve French <stfrench@microsoft.com>
Wed, 22 Apr 2026 14:54:07 +0000 (09:54 -0500)
commit0a8cf165566ba55a39fd0f4de172119dd646d39a
tree753b6aa081efdffe77d2b6dfaebbed704cbc0348
parenta58c5af19ff0d6f44f6e9fe31e33a2c92223f77e
smb: client: validate the whole DACL before rewriting it in cifsacl

build_sec_desc() and id_mode_to_cifs_acl() derive a DACL pointer from a
server-supplied dacloffset and then use the incoming ACL to rebuild the
chmod/chown security descriptor.

The original fix only checked that the struct smb_acl header fits before
reading dacl_ptr->size or dacl_ptr->num_aces.  That avoids the immediate
header-field OOB read, but the rewrite helpers still walk ACEs based on
pdacl->num_aces with no structural validation of the incoming DACL body.

A malicious server can return a truncated DACL that still contains a
header, claims one or more ACEs, and then drive
replace_sids_and_copy_aces() or set_chmod_dacl() past the validated
extent while they compare or copy attacker-controlled ACEs.

Factor the DACL structural checks into validate_dacl(), extend them to
validate each ACE against the DACL bounds, and use the shared validator
before the chmod/chown rebuild paths.  parse_dacl() reuses the same
validator so the read-side parser and write-side rewrite paths agree on
what constitutes a well-formed incoming DACL.

Fixes: bc3e9dd9d104 ("cifs: Change SIDs in ACEs while transferring file ownership.")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-4-6
Assisted-by: Codex:gpt-5-4
Signed-off-by: Michael Bommarito <michael.bommarito@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/smb/client/cifsacl.c