xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: fix fallocate when trying to allocate a hole.

Browse Source 
[ Upstream commit 488968a8945c119859d91bb6a8dc13bf50002f15 ]

Remove the conditional checking for out_data_len and skipping the fallocate
if it is 0. This is wrong will actually change any legitimate the fallocate
where the entire region is unallocated into a no-op.

Additionally, before allocating the range, if FALLOC_FL_KEEP_SIZE is set then
we need to clamp the length of the fallocate region as to not extend the size of the file.

Fixes: 966a3cb7c7db ("cifs: improve fallocate emulation")
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ronnie Sahlberg
2021-07-23 11:21:24 +10:00
committed by Greg Kroah-Hartman
parent c26372b8a8
commit 76f7eae7ec
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/cifs/smb2ops.c
View File

@@ -3516,11 +3516,6 @@ static int smb3_simple_fallocate_range(unsigned int xid,
(char **)&out_data, &out_data_len); (char **)&out_data, &out_data_len);
if (rc) if (rc)
goto out; goto out;
/*
* It is already all allocated
*/
if (out_data_len == 0)
goto out;
buf = kzalloc(1024 * 1024, GFP_KERNEL); buf = kzalloc(1024 * 1024, GFP_KERNEL);
if (buf == NULL) { if (buf == NULL) {
@@ -3643,6 +3638,24 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon,
goto out; goto out;
} }
if (keep_size == true) {
/*
* We can not preallocate pages beyond the end of the file
* in SMB2
*/
if (off >= i_size_read(inode)) {
rc = 0;
goto out;
}
/*
* For fallocates that are partially beyond the end of file,
* clamp len so we only fallocate up to the end of file.
*/
if (off + len > i_size_read(inode)) {
len = i_size_read(inode) - off;
}
}
if ((keep_size == true) || (i_size_read(inode) >= off + len)) { if ((keep_size == true) || (i_size_read(inode) >= off + len)) {
/* /*
* At this point, we are trying to fallocate an internal * At this point, we are trying to fallocate an internal