diff options
| author | satoru takeuchi <satoru.takeuchi@gmail.com> | 2017-09-12 22:42:52 +0900 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-11-02 10:46:02 +0100 |
| commit | 827a5cb0a0ad3a74426a4e0d12cbc59917785fa2 (patch) | |
| tree | fde0fc413df0f2a9cdeb75c76897719f80e973dd | |
| parent | 7210062e8fc3e0f9519382c0ad2df3266989a96d (diff) | |
| download | linux-stable-827a5cb0a0ad3a74426a4e0d12cbc59917785fa2.tar.gz | |
btrfs: prevent to set invalid default subvolid
commit 6d6d282932d1a609e60dc4467677e0e863682f57 upstream.
`btrfs sub set-default` succeeds to set an ID which isn't corresponding to any
fs/file tree. If such the bad ID is set to a filesystem, we can't mount this
filesystem without specifying `subvol` or `subvolid` mount options.
Fixes: 6ef5ed0d386b ("Btrfs: add ioctl and incompat flag to set the default mount subvol")
Cc: <stable@vger.kernel.org>
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Reviewed-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 296cc1b49446..7831e6865f16 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2974,6 +2974,10 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) ret = PTR_ERR(new_root); goto out; } + if (!is_fstree(new_root->objectid)) { + ret = -ENOENT; + goto out; + } if (btrfs_root_refs(&new_root->root_item) == 0) { ret = -ENOENT; |