Skip to content

Commit d07b26f

Browse files
mjbommarsmfrench
authored andcommitted
ksmbd: require minimum ACE size in smb_check_perm_dacl()
Both ACE-walk loops in smb_check_perm_dacl() only guard against an under-sized remaining buffer, not against an ACE whose declared `ace->size` is smaller than the struct it claims to describe: if (offsetof(struct smb_ace, access_req) > aces_size) break; ace_size = le16_to_cpu(ace->size); if (ace_size > aces_size) break; The first check only requires the 4-byte ACE header to be in bounds; it does not require access_req (4 bytes at offset 4) to be readable. An attacker who has set a crafted DACL on a file they own can declare ace->size == 4 with aces_size == 4, pass both checks, and then granted |= le32_to_cpu(ace->access_req); /* upper loop */ compare_sids(&sid, &ace->sid); /* lower loop */ reads access_req at offset 4 (OOB by up to 4 bytes) and ace->sid at offset 8 (OOB by up to CIFS_SID_BASE_SIZE + SID_MAX_SUB_AUTHORITIES * 4 bytes). Tighten both loops to require ace_size >= offsetof(struct smb_ace, sid) + CIFS_SID_BASE_SIZE which is the smallest valid on-wire ACE layout (4-byte header + 4-byte access_req + 8-byte sid base with zero sub-auths). Also reject ACEs whose sid.num_subauth exceeds SID_MAX_SUB_AUTHORITIES before letting compare_sids() dereference sub_auth[] entries. parse_sec_desc() already enforces an equivalent check (lines 441-448); smb_check_perm_dacl() simply grew weaker validation over time. Reachability: authenticated SMB client with permission to set an ACL on a file. On a subsequent CREATE against that file, the kernel walks the stored DACL via smb_check_perm_dacl() and triggers the OOB read. Not pre-auth, and the OOB read is not reflected to the attacker, but KASAN reports and kernel state corruption are possible. Fixes: e2f3448 ("cifsd: add server-side procedures for SMB3") 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> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent d6a6aa8 commit d07b26f

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

fs/smb/server/smbacl.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,10 +1342,13 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path,
13421342
ace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl));
13431343
aces_size = acl_size - sizeof(struct smb_acl);
13441344
for (i = 0; i < le16_to_cpu(pdacl->num_aces); i++) {
1345-
if (offsetof(struct smb_ace, access_req) > aces_size)
1345+
if (offsetof(struct smb_ace, sid) +
1346+
aces_size < CIFS_SID_BASE_SIZE)
13461347
break;
13471348
ace_size = le16_to_cpu(ace->size);
1348-
if (ace_size > aces_size)
1349+
if (ace_size > aces_size ||
1350+
ace_size < offsetof(struct smb_ace, sid) +
1351+
CIFS_SID_BASE_SIZE)
13491352
break;
13501353
aces_size -= ace_size;
13511354
granted |= le32_to_cpu(ace->access_req);
@@ -1360,13 +1363,19 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path,
13601363
ace = (struct smb_ace *)((char *)pdacl + sizeof(struct smb_acl));
13611364
aces_size = acl_size - sizeof(struct smb_acl);
13621365
for (i = 0; i < le16_to_cpu(pdacl->num_aces); i++) {
1363-
if (offsetof(struct smb_ace, access_req) > aces_size)
1366+
if (offsetof(struct smb_ace, sid) +
1367+
aces_size < CIFS_SID_BASE_SIZE)
13641368
break;
13651369
ace_size = le16_to_cpu(ace->size);
1366-
if (ace_size > aces_size)
1370+
if (ace_size > aces_size ||
1371+
ace_size < offsetof(struct smb_ace, sid) +
1372+
CIFS_SID_BASE_SIZE)
13671373
break;
13681374
aces_size -= ace_size;
13691375

1376+
if (ace->sid.num_subauth > SID_MAX_SUB_AUTHORITIES)
1377+
break;
1378+
13701379
if (!compare_sids(&sid, &ace->sid) ||
13711380
!compare_sids(&sid_unix_NFS_mode, &ace->sid)) {
13721381
found = 1;

0 commit comments

Comments
 (0)