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

fuse: lock inode unconditionally in fuse_fallocate()

Browse Source 
commit 44361e8cf9ddb23f17bdcc40ca944abf32e83e79 upstream.

file_modified() must be called with inode lock held.  fuse_fallocate()
didn't lock the inode in case of just FALLOC_KEEP_SIZE flags value, which
resulted in a kernel Warning in notify_change().

Lock the inode unconditionally, like all other fallocate implementations
do.

Reported-by: Pengfei Xu <pengfei.xu@intel.com>
Reported-and-tested-by: syzbot+462da39f0667b357c4b6@syzkaller.appspotmail.com
Fixes: 4a6f278d4827 ("fuse: add file_modified() to fallocate")
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Miklos Szeredi
2022-11-23 09:10:42 +01:00
committed by Greg Kroah-Hartman
parent 86f0082fb9
commit 4801672fb0
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
fs/fuse/file.c
View File

@@ -3275,10 +3275,9 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
.mode = mode .mode = mode
}; };
int err; int err;
bool lock_inode = !(mode & FALLOC_FL_KEEP_SIZE) || bool block_faults = FUSE_IS_DAX(inode) &&
(mode & FALLOC_FL_PUNCH_HOLE); (!(mode & FALLOC_FL_KEEP_SIZE) ||
(mode & FALLOC_FL_PUNCH_HOLE));
bool block_faults = FUSE_IS_DAX(inode) && lock_inode;
if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE))
return -EOPNOTSUPP; return -EOPNOTSUPP;
@@ -3286,22 +3285,20 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
if (fm->fc->no_fallocate) if (fm->fc->no_fallocate)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (lock_inode) { inode_lock(inode);
inode_lock(inode); if (block_faults) {
if (block_faults) { down_write(&fi->i_mmap_sem);
down_write(&fi->i_mmap_sem); err = fuse_dax_break_layouts(inode, 0, 0);
err = fuse_dax_break_layouts(inode, 0, 0); if (err)
if (err) goto out;
goto out; }
}
if (mode & FALLOC_FL_PUNCH_HOLE) { if (mode & FALLOC_FL_PUNCH_HOLE) {
loff_t endbyte = offset + length - 1; loff_t endbyte = offset + length - 1;
err = fuse_writeback_range(inode, offset, endbyte); err = fuse_writeback_range(inode, offset, endbyte);
if (err) if (err)
goto out; goto out;
}
} }
if (!(mode & FALLOC_FL_KEEP_SIZE) && if (!(mode & FALLOC_FL_KEEP_SIZE) &&
@@ -3351,8 +3348,7 @@ out:
if (block_faults) if (block_faults)
up_write(&fi->i_mmap_sem); up_write(&fi->i_mmap_sem);
if (lock_inode) inode_unlock(inode);
inode_unlock(inode);
fuse_flush_time_update(inode); fuse_flush_time_update(inode);