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
[ Upstream commit a80a486 ]

If ->NameOffset of smb2_create_req is smaller than Buffer offset of
smb2_create_req, slab-out-of-bounds read can happen from smb2_open.
This patch set the minimum value of the name offset to the buffer offset
to validate name length of smb2_create_req().

Cc: stable@vger.kernel.org
Reported-by: Xuanzhe Yu <yuxuanzhe@outlook.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
namjaejeon authored and gregkh committed Apr 3, 2024
1 parent ff2f9c4 commit 4f97e6a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion fs/smb/server/smb2misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,
case SMB2_CREATE:
{
unsigned short int name_off =
le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset);
max_t(unsigned short int,
le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset),
offsetof(struct smb2_create_req, Buffer));

unsigned short int name_len =
le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength);

Expand Down

0 comments on commit 4f97e6a

Please sign in to comment.