Commit a9f106c7 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

ksmbd: fix wrong allocation size update in smb2_open() 



When client send SMB2_CREATE_ALLOCATION_SIZE create context, ksmbd update
old size to ->AllocationSize in smb2 create response. ksmbd_vfs_getattr()
should be called after it to get updated stat result.

Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 658609d9

fs/smb/server/smb2pdu.c

+18 −18
Original line number Diff line number Diff line
@@ -2516,7 +2516,7 @@ static void smb2_new_xattrs(struct ksmbd_tree_connect *tcon, const struct path * 
	da.flags = XATTR_DOSINFO_ATTRIB | XATTR_DOSINFO_CREATE_TIME |

		XATTR_DOSINFO_ITIME;



	rc = ksmbd_vfs_set_dos_attrib_xattr(mnt_idmap(path->mnt), path, &da, false);

	rc = ksmbd_vfs_set_dos_attrib_xattr(mnt_idmap(path->mnt), path, &da, true);

	if (rc)

		ksmbd_debug(SMB, "failed to store file attribute into xattr\n");

}
@@ -3185,23 +3185,6 @@ int smb2_open(struct ksmbd_work *work) 
		goto err_out;

	}



	rc = ksmbd_vfs_getattr(&path, &stat);

	if (rc)

		goto err_out;



	if (stat.result_mask & STATX_BTIME)

		fp->create_time = ksmbd_UnixTimeToNT(stat.btime);

	else

		fp->create_time = ksmbd_UnixTimeToNT(stat.ctime);

	if (req->FileAttributes || fp->f_ci->m_fattr == 0)

		fp->f_ci->m_fattr =

			cpu_to_le32(smb2_get_dos_mode(&stat, le32_to_cpu(req->FileAttributes)));



	if (!created)

		smb2_update_xattrs(tcon, &path, fp);

	else

		smb2_new_xattrs(tcon, &path, fp);



	if (file_present || created)

		ksmbd_vfs_kern_path_unlock(&parent_path, &path);
@@ -3302,6 +3285,23 @@ int smb2_open(struct ksmbd_work *work) 
		}

	}



	rc = ksmbd_vfs_getattr(&path, &stat);

	if (rc)

		goto err_out1;



	if (stat.result_mask & STATX_BTIME)

		fp->create_time = ksmbd_UnixTimeToNT(stat.btime);

	else

		fp->create_time = ksmbd_UnixTimeToNT(stat.ctime);

	if (req->FileAttributes || fp->f_ci->m_fattr == 0)

		fp->f_ci->m_fattr =

			cpu_to_le32(smb2_get_dos_mode(&stat, le32_to_cpu(req->FileAttributes)));



	if (!created)

		smb2_update_xattrs(tcon, &path, fp);

	else

		smb2_new_xattrs(tcon, &path, fp);



	memcpy(fp->client_guid, conn->ClientGUID, SMB2_CLIENT_GUID_SIZE);



	rsp->StructureSize = cpu_to_le16(89);