|
@@ -453,6 +453,9 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
return -EROFS;
|
|
return -EROFS;
|
|
|
|
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN))
|
|
|
|
+ return -EPERM;
|
|
|
|
+
|
|
vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
|
|
|
|
if (!vol_args)
|
|
if (!vol_args)
|
|
@@ -638,16 +641,24 @@ static int btrfs_ioctl_defrag(struct file *file)
|
|
|
|
|
|
switch (inode->i_mode & S_IFMT) {
|
|
switch (inode->i_mode & S_IFMT) {
|
|
case S_IFDIR:
|
|
case S_IFDIR:
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN)) {
|
|
|
|
+ ret = -EPERM;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
btrfs_defrag_root(root, 0);
|
|
btrfs_defrag_root(root, 0);
|
|
btrfs_defrag_root(root->fs_info->extent_root, 0);
|
|
btrfs_defrag_root(root->fs_info->extent_root, 0);
|
|
break;
|
|
break;
|
|
case S_IFREG:
|
|
case S_IFREG:
|
|
|
|
+ if (!(file->f_mode & FMODE_WRITE)) {
|
|
|
|
+ ret = -EINVAL;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
btrfs_defrag_file(file);
|
|
btrfs_defrag_file(file);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+out:
|
|
mnt_drop_write(file->f_path.mnt);
|
|
mnt_drop_write(file->f_path.mnt);
|
|
- return 0;
|
|
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg)
|
|
static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg)
|
|
@@ -655,6 +666,9 @@ static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg)
|
|
struct btrfs_ioctl_vol_args *vol_args;
|
|
struct btrfs_ioctl_vol_args *vol_args;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN))
|
|
|
|
+ return -EPERM;
|
|
|
|
+
|
|
vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
|
|
|
|
if (!vol_args)
|
|
if (!vol_args)
|
|
@@ -677,6 +691,9 @@ static long btrfs_ioctl_rm_dev(struct btrfs_root *root, void __user *arg)
|
|
struct btrfs_ioctl_vol_args *vol_args;
|
|
struct btrfs_ioctl_vol_args *vol_args;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN))
|
|
|
|
+ return -EPERM;
|
|
|
|
+
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
return -EROFS;
|
|
return -EROFS;
|
|
|
|
|
|
@@ -726,6 +743,10 @@ static long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
|
|
* they don't overlap)?
|
|
* they don't overlap)?
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
+ /* the destination must be opened for writing */
|
|
|
|
+ if (!(file->f_mode & FMODE_WRITE))
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
ret = mnt_want_write(file->f_path.mnt);
|
|
ret = mnt_want_write(file->f_path.mnt);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|