diff options
| author | 2026-04-19 20:11:31 -0400 | |
|---|---|---|
| committer | 2026-04-27 07:30:18 -0600 | |
| commit | b78db9bddc84136f6a0bb49e8883cf200dfb87a8 (patch) | |
| tree | 5de6a5539eaec764efeb79252898704b1bd4537f /include/net/ssh:/git@git.zx2c4.com | |
| parent | smb: client: require a full NFS mode SID before reading mode bits (diff) | |
smb: client: validate the whole DACL before rewriting it in cifsacl
commit 0a8cf165566ba55a39fd0f4de172119dd646d39a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions
