iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Btrfs: don't leak ioctl args in btrfs_ioctl_dev_replace

Browse Source 
struct btrfs_ioctl_dev_replace_args memory is leaked if replace is
requested on a read-only filesystem.  Fix it.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Ilya Dryomov
2013-10-10 20:39:28 +03:00
committed by Chris Mason
parent f747cab7b7
commit adfa97cbdf
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/btrfs/ioctl.c
View File

@ -3667,9 +3667,10 @@ static long btrfs_ioctl_dev_replace(struct btrfs_root *root, void __user *arg)
switch (p->cmd) { switch (p->cmd) {
case BTRFS_IOCTL_DEV_REPLACE_CMD_START: case BTRFS_IOCTL_DEV_REPLACE_CMD_START:
if (root->fs_info->sb->s_flags & MS_RDONLY) if (root->fs_info->sb->s_flags & MS_RDONLY) {
return -EROFS; ret = -EROFS;
goto out;
}
if (atomic_xchg( if (atomic_xchg(
&root->fs_info->mutually_exclusive_operation_running, &root->fs_info->mutually_exclusive_operation_running,
1)) { 1)) {
@ -3695,7 +3696,7 @@ static long btrfs_ioctl_dev_replace(struct btrfs_root *root, void __user *arg)
if (copy_to_user(arg, p, sizeof(*p))) if (copy_to_user(arg, p, sizeof(*p)))
ret = -EFAULT; ret = -EFAULT;
out:
kfree(p); kfree(p);
return ret; return ret;
} }