Skip to content

Commit

Permalink
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
Browse files Browse the repository at this point in the history
If ->NameOffset/Length is bigger than ->CreateContextsOffset/Length,
ksmbd_check_message doesn't validate request buffer it correctly.
So slab-out-of-bounds warning from calling smb_strndup_from_utf16()
in smb2_open() could happen. If ->NameLength is non-zero, Set the larger
of the two sums (Name and CreateContext size) as the offset and length of
the data area.

Reported-by: Yang Chaoming <[email protected]>
Signed-off-by: Namjae Jeon <[email protected]>
  • Loading branch information
namjaejeon committed Dec 20, 2023
1 parent 8869ec0 commit f06397d
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions smb2misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,25 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,
break;
case SMB2_CREATE:
{
unsigned short int name_off =
le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset);
unsigned short int name_len =
le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength);

if (((struct smb2_create_req *)hdr)->CreateContextsLength) {
*off = le32_to_cpu(((struct smb2_create_req *)
hdr)->CreateContextsOffset);
*len = le32_to_cpu(((struct smb2_create_req *)
hdr)->CreateContextsLength);
break;
if (!name_len)
break;

if (name_off + name_len < (u64)*off + *len)
break;
}

*off = le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset);
*len = le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength);
*off = name_off;
*len = name_len;
break;
}
case SMB2_QUERY_INFO:
Expand Down

0 comments on commit f06397d

Please sign in to comment.