ksmbd: add request buffer validation in smb2_set_info
Subsystems (2)
Namjae Jeon
maintainerPATCH v3 1/1 ksmbd: add request buffer validation in smb2_set_info
Add buffer validation in smb2_set_info, and remove unused variable in set_file_basic_info. and smb2_set_info infolevel functions take structure pointer argument.
---
v2:
- smb2_set_info infolevel functions take structure pointer argument.
v3:
- change data type of next and buf_len variable to unsigned.
fs/ksmbd/smb2pdu.c | 149 ++++++++++++++++++++++++++++++++------------- fs/ksmbd/smb2pdu.h | 9 +++ 2 files changed, 116 insertions(+), 42 deletions(-)
fs/ksmbd/smb2pdu.c +107 -42
@@ -2107,16 +2107,22 @@ static noinline int create_smb2_pipe(struct ksmbd_work *work)* smb2_set_ea() - handler for setting extended attributes using set * info command * @eabuf: set info command buffer +* @buf_len: set info command buffer length * @path: dentry path for get ea * * Return: 0 on success, otherwise error */ -static int smb2_set_ea (struct smb2_ea_info *eabuf,struct path *path) +static int smb2_set_ea (struct smb2_ea_info *eabuf,unsigned int buf_len, +struct path *path) {struct user_namespace *user_ns =mnt_user_ns (path->mnt);char *attr_name =NULL , *value;int rc =0 ; -int next =0 ; +unsigned int next =0 ; + +if (buf_len <sizeof (struct smb2_ea_info ) + eabuf->EaNameLength + +le16_to_cpu (eabuf->EaValueLength)) +return -EINVAL ; attr_name =kmalloc (XATTR_NAME_MAX +1 ,GFP_KERNEL );if (!attr_name)
@@ -2181,7 +2187,13 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, struct path *path) next: next =le32_to_cpu (eabuf->NextEntryOffset); +if (next ==0 || buf_len < next) +break ; + buf_len -= next; eabuf = (struct smb2_ea_info *)((char *)eabuf + next); +if (next < eabuf->EaNameLength +le16_to_cpu (eabuf->EaValueLength)) +break ; + }while (next !=0 );kfree (attr_name);
@@ -2787,7 +2799,15 @@ int smb2_open(struct ksmbd_work *work) created = true; user_ns =mnt_user_ns (path.mnt);if (ea_buf) { - rc =smb2_set_ea (&ea_buf->ea, &path); +if (le32_to_cpu (ea_buf->ccontext.DataLength) < +sizeof (struct smb2_ea_info )) { + rc = -EINVAL ; + goto err_out; + } + + rc =smb2_set_ea (&ea_buf->ea, +le32_to_cpu (ea_buf->ccontext.DataLength), + &path);if (rc == -EOPNOTSUPP ) rc =0 ;else if (rc)
@@ -5377,7 +5397,7 @@ static int smb2_rename(struct ksmbd_work *work,static int smb2_create_link (struct ksmbd_work *work,struct ksmbd_share_config *share,struct smb2_file_link_info *file_info, -struct file *filp, +unsigned int buf_len,struct file *filp,struct nls_table *local_nls) {char *link_name =NULL , *target_name =NULL , *pathname =NULL ;
@@ -5385,6 +5405,10 @@ static int smb2_create_link(struct ksmbd_work *work,bool file_present = true;int rc; +if (buf_len <sizeof (struct smb2_file_link_info ) + +le32_to_cpu (file_info->FileNameLength)) +return -EINVAL ; +ksmbd_debug (SMB ,"setting FILE_LINK_INFORMATION\n" ); pathname =kmalloc (PATH_MAX ,GFP_KERNEL );if (!pathname)
@@ -5441,10 +5465,10 @@ static int smb2_create_link(struct ksmbd_work *work,return rc; } -static int set_file_basic_info (struct ksmbd_file *fp,char *buf, +static int set_file_basic_info (struct ksmbd_file *fp, +struct smb2_file_basic_info *file_info,struct ksmbd_share_config *share) { -struct smb2_file_all_info *file_info;struct iattr attrs;struct timespec64 ctime;struct file *filp;
@@ -5455,7 +5479,6 @@ static int set_file_basic_info(struct ksmbd_file *fp, char *buf,if (!(fp->daccess &FILE_WRITE_ATTRIBUTES_LE ))return -EACCES ; - file_info = (struct smb2_file_all_info *)buf; attrs.ia_valid =0 ; filp = fp->filp; inode =file_inode (filp);
@@ -5532,7 +5555,8 @@ static int set_file_basic_info(struct ksmbd_file *fp, char *buf, }static int set_file_allocation_info (struct ksmbd_work *work, -struct ksmbd_file *fp,char *buf) +struct ksmbd_file *fp, +struct smb2_file_alloc_info *file_alloc_info) {/* * TODO : It's working fine only when store dos attributes
@@ -5540,7 +5564,6 @@ static int set_file_allocation_info(struct ksmbd_work *work,* properly with any smb.conf option */ -struct smb2_file_alloc_info *file_alloc_info;loff_t alloc_blks;struct inode *inode;int rc;
@@ -5548,7 +5571,6 @@ static int set_file_allocation_info(struct ksmbd_work *work,if (!(fp->daccess &FILE_WRITE_DATA_LE ))return -EACCES ; - file_alloc_info = (struct smb2_file_alloc_info *)buf; alloc_blks = (le64_to_cpu (file_alloc_info->AllocationSize) +511 ) >>9 ; inode =file_inode (fp->filp);
@@ -5584,9 +5606,8 @@ static int set_file_allocation_info(struct ksmbd_work *work, }static int set_end_of_file_info (struct ksmbd_work *work,struct ksmbd_file *fp, -char *buf) +struct smb2_file_eof_info *file_eof_info) { -struct smb2_file_eof_info *file_eof_info;loff_t newsize;struct inode *inode;int rc;
@@ -5594,7 +5615,6 @@ static int set_end_of_file_info(struct ksmbd_work *work, struct ksmbd_file *fp,if (!(fp->daccess &FILE_WRITE_DATA_LE ))return -EACCES ; - file_eof_info = (struct smb2_file_eof_info *)buf; newsize =le64_to_cpu (file_eof_info->EndOfFile); inode =file_inode (fp->filp);
@@ -5621,7 +5641,8 @@ static int set_end_of_file_info(struct ksmbd_work *work, struct ksmbd_file *fp, }static int set_rename_info (struct ksmbd_work *work,struct ksmbd_file *fp, -char *buf) +struct smb2_file_rename_info *rename_info, +unsigned int buf_len) {struct user_namespace *user_ns;struct ksmbd_file *parent_fp;
@@ -5634,6 +5655,10 @@ static int set_rename_info(struct ksmbd_work *work, struct ksmbd_file *fp,return -EACCES ; } +if (buf_len <sizeof (struct smb2_file_rename_info ) + +le32_to_cpu (rename_info->FileNameLength)) +return -EINVAL ; + user_ns =file_mnt_user_ns (fp->filp);if (ksmbd_stream_fd (fp)) goto next;
@@ -5656,14 +5681,13 @@ static int set_rename_info(struct ksmbd_work *work, struct ksmbd_file *fp, } } next: -return smb2_rename (work, fp, user_ns, - (struct smb2_file_rename_info *)buf, +return smb2_rename (work, fp, user_ns, rename_info, work->sess->conn->local_nls); } -static int set_file_disposition_info (struct ksmbd_file *fp,char *buf) +static int set_file_disposition_info (struct ksmbd_file *fp, +struct smb2_file_disposition_info *file_info) { -struct smb2_file_disposition_info *file_info;struct inode *inode;if (!(fp->daccess &FILE_DELETE_LE )) {
@@ -5672,7 +5696,6 @@ static int set_file_disposition_info(struct ksmbd_file *fp, char *buf) } inode =file_inode (fp->filp); - file_info = (struct smb2_file_disposition_info *)buf;if (file_info->DeletePending) {if (S_ISDIR (inode->i_mode) &&ksmbd_vfs_empty_dir (fp) == -ENOTEMPTY )
@@ -5684,15 +5707,14 @@ static int set_file_disposition_info(struct ksmbd_file *fp, char *buf)return 0 ; } -static int set_file_position_info (struct ksmbd_file *fp,char *buf) +static int set_file_position_info (struct ksmbd_file *fp, +struct smb2_file_pos_info *file_info) { -struct smb2_file_pos_info *file_info;loff_t current_byte_offset;unsigned long sector_size;struct inode *inode; inode =file_inode (fp->filp); - file_info = (struct smb2_file_pos_info *)buf; current_byte_offset =le64_to_cpu (file_info->CurrentByteOffset); sector_size = inode->i_sb->s_blocksize;
@@ -5708,12 +5730,11 @@ static int set_file_position_info(struct ksmbd_file *fp, char *buf)return 0 ; } -static int set_file_mode_info (struct ksmbd_file *fp,char *buf) +static int set_file_mode_info (struct ksmbd_file *fp, +struct smb2_file_mode_info *file_info) { -struct smb2_file_mode_info *file_info;__le32 mode; - file_info = (struct smb2_file_mode_info *)buf; mode = file_info->Mode; if ((mode & ~FILE_MODE_INFO_MASK) ||
@@ -5743,40 +5764,74 @@ static int set_file_mode_info(struct ksmbd_file *fp, char *buf)* TODO: need to implement an error handling for STATUS_INFO_LENGTH_MISMATCH */ static int smb2_set_info_file (struct ksmbd_work *work,struct ksmbd_file *fp, -int info_class,char *buf, +struct smb2_set_info_req *req,struct ksmbd_share_config *share) { -switch (info_class) { +unsigned int buf_len =le32_to_cpu (req->BufferLength); + +switch (req->FileInfoClass) {case FILE_BASIC_INFORMATION : -return set_file_basic_info (fp, buf, share); + { +if (buf_len <sizeof (struct smb2_file_basic_info )) +return -EINVAL ; +return set_file_basic_info (fp, (struct smb2_file_basic_info *)req->Buffer, share); + }case FILE_ALLOCATION_INFORMATION : -return set_file_allocation_info (work, fp, buf); + { +if (buf_len <sizeof (struct smb2_file_alloc_info )) +return -EINVAL ; +return set_file_allocation_info (work, fp, + (struct smb2_file_alloc_info *)req->Buffer); + }case FILE_END_OF_FILE_INFORMATION : -return set_end_of_file_info (work, fp, buf); + { +if (buf_len <sizeof (struct smb2_file_eof_info )) +return -EINVAL ; +return set_end_of_file_info (work, fp, + (struct smb2_file_eof_info *)req->Buffer); + }case FILE_RENAME_INFORMATION : + {if (!test_tree_conn_flag (work->tcon,KSMBD_TREE_CONN_FLAG_WRITABLE )) {ksmbd_debug (SMB ,"User does not have write permission\n" );return -EACCES ; } -return set_rename_info (work, fp, buf); +if (buf_len <sizeof (struct smb2_file_rename_info )) +return -EINVAL ; + +return set_rename_info (work, fp, + (struct smb2_file_rename_info *)req->Buffer, + buf_len); + }case FILE_LINK_INFORMATION : + { +if (buf_len <sizeof (struct smb2_file_link_info )) +return -EINVAL ; +return smb2_create_link (work, work->tcon->share_conf, - (struct smb2_file_link_info *)buf, fp->filp, + (struct smb2_file_link_info *)req->Buffer, + buf_len, fp->filp, work->sess->conn->local_nls); - + }case FILE_DISPOSITION_INFORMATION : + {if (!test_tree_conn_flag (work->tcon,KSMBD_TREE_CONN_FLAG_WRITABLE )) {ksmbd_debug (SMB ,"User does not have write permission\n" );return -EACCES ; } -return set_file_disposition_info (fp, buf); +if (buf_len <sizeof (struct smb2_file_disposition_info )) +return -EINVAL ; + +return set_file_disposition_info (fp, + (struct smb2_file_disposition_info *)req->Buffer); + }case FILE_FULL_EA_INFORMATION : {if (!(fp->daccess &FILE_WRITE_EA_LE )) {
@@ -5785,18 +5840,29 @@ static int smb2_set_info_file(struct ksmbd_work *work, struct ksmbd_file *fp,return -EACCES ; } -return smb2_set_ea ((struct smb2_ea_info *)buf, - &fp->filp->f_path); - } +if (buf_len <sizeof (struct smb2_ea_info )) +return -EINVAL ; +return smb2_set_ea ((struct smb2_ea_info *)req->Buffer, + buf_len, &fp->filp->f_path); + }case FILE_POSITION_INFORMATION : -return set_file_position_info (fp, buf); + { +if (buf_len <sizeof (struct smb2_file_pos_info )) +return -EINVAL ; +return set_file_position_info (fp, (struct smb2_file_pos_info *)req->Buffer); + }case FILE_MODE_INFORMATION : -return set_file_mode_info (fp, buf); + { +if (buf_len <sizeof (struct smb2_file_mode_info )) +return -EINVAL ; + +return set_file_mode_info (fp, (struct smb2_file_mode_info *)req->Buffer); + } } -pr_err ("Unimplemented Fileinfoclass :%d\n" , info_class); +pr_err ("Unimplemented Fileinfoclass :%d\n" , req->FileInfoClass);return -EOPNOTSUPP ; }
@@ -5857,8 +5923,7 @@ int smb2_set_info(struct ksmbd_work *work)switch (req->InfoType) {case SMB2_O_INFO_FILE :ksmbd_debug (SMB ,"GOT SMB2_O_INFO_FILE\n" ); - rc =smb2_set_info_file (work, fp, req->FileInfoClass, - req->Buffer, work->tcon->share_conf); + rc =smb2_set_info_file (work, fp, req, work->tcon->share_conf);break ;case SMB2_O_INFO_SECURITY :ksmbd_debug (SMB ,"GOT SMB2_O_INFO_SECURITY\n" );
fs/ksmbd/smb2pdu.h +9 -0
@@ -1464,6 +1464,15 @@ struct smb2_file_all_info { /* data block encoding of response to level 18 */char FileName[1 ]; } __packed;/* level 18 Query */ +struct smb2_file_basic_info {/* data block encoding of response to level 18 */ +__le64 CreationTime;/* Beginning of FILE_BASIC_INFO equivalent */ +__le64 LastAccessTime; +__le64 LastWriteTime; +__le64 ChangeTime; +__le32 Attributes; +__u32 Pad1;/* End of FILE_BASIC_INFO_INFO equivalent */ +} __packed; +struct smb2_file_alt_name_info {__le32 FileNameLength;char FileName[0 ];
Signature · 1 line
2.25.1
Hi Namjae,
patch looks great. One nitpick.
Am 22.09.21 um 06:19 schrieb Namjae Jeon:
fs/ksmbd/smb2pdu.h struct smb2_file_all_info { /* data block encoding of response to level 18 */ · line 1475
Quoted 13 lines
Add buffer validation in
smb2_set_info, and remove unused variable inset_file_basic_info. andsmb2_set_infoinfolevel functions take structure pointer argument.
...fs/ksmbd/smb2pdu.h +9
-0+struct smb2_file_basic_info {/* data block encoding of response to level 18 */ +__le64 CreationTime;/* Beginning of FILE_BASIC_INFO equivalent */ +__le64 LastAccessTime; +__le64 LastWriteTime; +__le64 ChangeTime; +__le32 Attributes; +__u32 Pad1;/* End of FILE_BASIC_INFO_INFO equivalent */ +} __packed; +
adding struct smb2_file_basic_info and the fix in the handler should be done in a preceeding commit.
Thanks!
-slow
Signature · 2 lines
Ralph Boehme, Samba Team https://samba.org/ SerNet Samba Team Lead https://sernet.de/en/team-samba
Namjae Jeon
maintainer2021-09-22 22:39 GMT+09:00, Ralph Boehme <[email protected]>:
Quoted 14 lines
Hi Namjae,
patch looks great. One nitpick.
Am 22.09.21 um 06:19 schrieb Namjae Jeon:
Quoted 9 lines
Add buffer validation in
smb2_set_info, and remove unused variable inset_file_basic_info. andsmb2_set_infoinfolevel functions take structure pointer argument.
...
+structsmb2_file_basic_info{ /* data block encoding of response to level 18 */fs/ksmbd/smb2pdu.h +3
-0+__le64 CreationTime;/* Beginning of FILE_BASIC_INFO equivalent */ +__le64 LastAccessTime; +__le64 LastWriteTime;
Quoted 8 lines
fs/ksmbd/smb2pdu.h struct smb2_file_all_info { /* data block encoding of response to level 18 */ · line 1475
Quoted 5 lines
fs/ksmbd/smb2pdu.h +5
-0+__le64 ChangeTime; +__le32 Attributes; +__u32 Pad1;/* End of FILE_BASIC_INFO_INFO equivalent */ +} __packed; +adding struct
smb2_file_basic_infoand the fix in the handler should be done in a preceeding commit.
Well, This structure is added for buffer check. There is no problem using smb2_file_all_info as before if there is no buffer check.
Thanks!
Quoted 9 lines
Thanks!
-slow--
Ralph Boehme, Samba Team https://samba.org/
SerNet Samba Team Lead https://sernet.de/en/team-samba