summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2018-09-18 15:34:33 +0200
committerMiklos Szeredi <mszeredi@redhat.com>2018-09-24 10:54:01 +0200
commitd9d150ae50675e3c1d68047aafb2e981be685d90 (patch)
treef0b76cd1a916c487957bfd5690b3e19c1dbb8ccb /fs
parentovl: fix freeze protection bypass in ovl_write_iter() (diff)
downloadlinux-d9d150ae50675e3c1d68047aafb2e981be685d90.tar.xz
linux-d9d150ae50675e3c1d68047aafb2e981be685d90.zip
ovl: fix freeze protection bypass in ovl_clone_file_range()
Tested by doing clone on overlayfs while upper xfs+reflink is frozen: xfs_io -f /ovl/y fsfreeze -f /xfs xfs_io> reflink /ovl/x Before the fix xfs_io enters xfs_reflink_remap_range() and blocks in xfs_trans_alloc(). After the fix, xfs_io blocks outside xfs code in ovl_clone_file_range(). Fixes: 8ede205541ff ("ovl: add reflink/copyfile/dedup support") Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/overlayfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index 986313da0c88..5d1b4b38f743 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -461,7 +461,7 @@ static ssize_t ovl_copyfile(struct file *file_in, loff_t pos_in,
break;
case OVL_CLONE:
- ret = vfs_clone_file_range(real_in.file, pos_in,
+ ret = do_clone_file_range(real_in.file, pos_in,
real_out.file, pos_out, len);
break;