Skip to content

Commit beef263

Browse files
namjaejeonsmfrench
authored andcommitted
ksmbd: fix potencial OOB in get_file_all_info() for compound requests
When a compound request consists of QUERY_DIRECTORY + QUERY_INFO (FILE_ALL_INFORMATION) and the first command consumes nearly the entire max_trans_size, get_file_all_info() would blindly call smbConvertToUTF16() with PATH_MAX, causing out-of-bounds write beyond the response buffer. In get_file_all_info(), there was a missing validation check for the client-provided OutputBufferLength before copying the filename into FileName field of the smb2_file_all_info structure. If the filename length exceeds the available buffer space, it could lead to potential buffer overflows or memory corruption during smbConvertToUTF16 conversion. This calculating the actual free buffer size using smb2_calc_max_out_buf_len() and returning -EINVAL if the buffer is insufficient and updating smbConvertToUTF16 to use the actual filename length (clamped by PATH_MAX) to ensure a safe copy operation. Cc: [email protected] Fixes: e2b76ab ("ksmbd: add support for read compound") Reported-by: Asim Viladi Oglu Manizada <[email protected]> Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 0e55f63 commit beef263

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

fs/smb/server/smb2pdu.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4940,7 +4940,8 @@ static int get_file_all_info(struct ksmbd_work *work,
49404940
int conv_len;
49414941
char *filename;
49424942
u64 time;
4943-
int ret;
4943+
int ret, buf_free_len, filename_len;
4944+
struct smb2_query_info_req *req = ksmbd_req_buf_next(work);
49444945

49454946
if (!(fp->daccess & FILE_READ_ATTRIBUTES_LE)) {
49464947
ksmbd_debug(SMB, "no right to read the attributes : 0x%x\n",
@@ -4952,6 +4953,16 @@ static int get_file_all_info(struct ksmbd_work *work,
49524953
if (IS_ERR(filename))
49534954
return PTR_ERR(filename);
49544955

4956+
filename_len = strlen(filename);
4957+
buf_free_len = smb2_calc_max_out_buf_len(work,
4958+
offsetof(struct smb2_query_info_rsp, Buffer) +
4959+
offsetof(struct smb2_file_all_info, FileName),
4960+
le32_to_cpu(req->OutputBufferLength));
4961+
if (buf_free_len < (filename_len + 1) * 2) {
4962+
kfree(filename);
4963+
return -EINVAL;
4964+
}
4965+
49554966
ret = vfs_getattr(&fp->filp->f_path, &stat, STATX_BASIC_STATS,
49564967
AT_STATX_SYNC_AS_STAT);
49574968
if (ret) {
@@ -4995,7 +5006,8 @@ static int get_file_all_info(struct ksmbd_work *work,
49955006
file_info->Mode = fp->coption;
49965007
file_info->AlignmentRequirement = 0;
49975008
conv_len = smbConvertToUTF16((__le16 *)file_info->FileName, filename,
4998-
PATH_MAX, conn->local_nls, 0);
5009+
min(filename_len, PATH_MAX),
5010+
conn->local_nls, 0);
49995011
conv_len *= 2;
50005012
file_info->FileNameLength = cpu_to_le32(conv_len);
50015013
rsp->OutputBufferLength =

0 commit comments

Comments
 (0)