btrfs: Check if dest_offset is block-size aligned before cloning file
PATCH 1/2 btrfs: Check if dest_offset is block-size aligned before cloning file
We've done the check for src_offset and src_length, and We should also check dest_offset, otherwise we'll corrupt the destination file:
(After cloning file1 to file2 with unaligned dest_offset)
# cat /mnt/file2 cat: /mnt/file2: Input/output error
--- fs/btrfs/ioctl.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
fs/btrfs/ioctl.c +3 -4
@@ -1669,12 +1669,11 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, olen = len = src->i_size - off;/* if we extend to eof, continue to block boundary */ if (off + len == src->i_size) - len = ((src->i_size + bs-1 ) & ~(bs-1 )) - - off; + len =ALIGN (src->i_size, bs) - off;/* verify the end result is block aligned */ -if ((off & (bs-1 )) || - ((off + len) & (bs-1 ))) +if (!IS_ALIGNED (off, bs) || !IS_ALIGNED (off + len, bs) || + !IS_ALIGNED (destoff, bs)) goto out_unlock;/* do any pending delalloc/csum calc on src, one way or
Signature · 1 line
1.6.3
PATCH 2/2 btrfs: Set file size correctly in file clone
Set src_offset = 0, src_length = 20K, dest_offset = 20K. And the original filesize of the dest file 'file2' is 30K:
# ls -l /mnt/file2 -rw-r--r-- 1 root root 30720 Nov 18 16:42 /mnt/file2
Now clone file1 to file2, the dest file should be 40K, but it still shows 30K:
# ls -l /mnt/file2 -rw-r--r-- 1 root root 30720 Nov 18 16:42 /mnt/file2
--- fs/btrfs/ioctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +2 -2
@@ -1873,8 +1873,8 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,* but shouldn't round up the file size */ endoff = new_key.offset + datal; -if (endoff > off+olen) - endoff = off+olen; +if (endoff > destoff+olen) + endoff = destoff+olen;if (endoff > inode->i_size)btrfs_i_size_write (inode, endoff);
Signature · 1 line
1.6.3
Quoted 23 lines · Li Zefan
We've done the check for
src_offsetandsrc_length, and We should also checkdest_offset, otherwise we'll corrupt the destination file:(After cloning file1 to file2 with unaligned
dest_offset)# cat /mnt/file2 cat: /mnt/file2: Input/output errorSigned-off-by Li Zefan <[email protected]>--- fs/btrfs/ioctl.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)fs/btrfs/ioctl.c +0
-2@@ -1669,12 +1669,11 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, olen = len = src->i_size - off;/* if we extend to eof, continue to block boundary */ if (off + len == src->i_size) - len = ((src->i_size + bs-1 ) & ~(bs-1 )) - - off;
fs/btrfs/ioctl.c static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, · line 1679
Quoted 10 lines
fs/btrfs/ioctl.c +3
-2+ len =ALIGN (src->i_size, bs) - off;/* verify the end result is block aligned */ -if ((off & (bs-1 )) || - ((off + len) & (bs-1 ))) +if (!IS_ALIGNED (off, bs) || !IS_ALIGNED (off + len, bs) || + !IS_ALIGNED (destoff, bs)) goto out_unlock;/* do any pending delalloc/csum calc on src, one way or
Looks good.
Re: [PATCH 2/2] btrfs: Set file size correctly in file clone
In reply to Li ZefanQuoted 22 lines · Li Zefan
Set
src_offset= 0,src_length= 20K,dest_offset= 20K. And the original filesize of the dest file 'file2' is 30K:# ls -l /mnt/file2 -rw-r--r-- 1 root root 30720 Nov 18 16:42 /mnt/file2Now clone file1 to file2, the dest file should be 40K, but it still shows 30K:
# ls -l /mnt/file2 -rw-r--r-- 1 root root 30720 Nov 18 16:42 /mnt/file2Signed-off-by Li Zefan <[email protected]>--- fs/btrfs/ioctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/btrfs/ioctl.c +0
-0
fs/btrfs/ioctl.c static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, · line 1879
Quoted 9 lines
fs/btrfs/ioctl.c +2
-2@@ -1873,8 +1873,8 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,* but shouldn't round up the file size */ endoff = new_key.offset + datal; -if (endoff > off+olen) - endoff = off+olen; +if (endoff > destoff+olen) + endoff = destoff+olen;if (endoff > inode->i_size)btrfs_i_size_write (inode, endoff);