Commit 2a6b8dae authored by Li Zefan's avatar Li Zefan Committed by Chris Mason

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
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 0de90876
...@@ -1669,12 +1669,11 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, ...@@ -1669,12 +1669,11 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
olen = len = src->i_size - off; olen = len = src->i_size - off;
/* if we extend to eof, continue to block boundary */ /* if we extend to eof, continue to block boundary */
if (off + len == src->i_size) if (off + len == src->i_size)
len = ((src->i_size + bs-1) & ~(bs-1)) len = ALIGN(src->i_size, bs) - off;
- off;
/* verify the end result is block aligned */ /* verify the end result is block aligned */
if ((off & (bs-1)) || if (!IS_ALIGNED(off, bs) || !IS_ALIGNED(off + len, bs) ||
((off + len) & (bs-1))) !IS_ALIGNED(destoff, bs))
goto out_unlock; goto out_unlock;
/* do any pending delalloc/csum calc on src, one way or /* do any pending delalloc/csum calc on src, one way or
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment