diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-15 21:55:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-15 21:55:31 +0200 |
| commit | 18e41da89d55014d25b9a24502ee92b7f50599f9 (patch) | |
| tree | 5ce8ebd7456f377e4cfbff0ae83e84295617a4a8 | |
| parent | lib/btree: fix possible NULL pointer dereference (diff) | |
| parent | Btrfs: check for read permission on src file in the clone ioctl (diff) | |
| download | linux-18e41da89d55014d25b9a24502ee92b7f50599f9.tar.xz linux-18e41da89d55014d25b9a24502ee92b7f50599f9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: check for read permission on src file in the clone ioctl
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index e84ef60ffe35..97a97839a867 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1481,12 +1481,17 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, ret = -EBADF; goto out_drop_write; } + src = src_file->f_dentry->d_inode; ret = -EINVAL; if (src == inode) goto out_fput; + /* the src must be open for reading */ + if (!(src_file->f_mode & FMODE_READ)) + goto out_fput; + ret = -EISDIR; if (S_ISDIR(src->i_mode) || S_ISDIR(inode->i_mode)) goto out_fput; |