diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2013-02-12 16:27:46 +0000 |
|---|---|---|
| committer |   Josef Bacik <jbacik@fusionio.com> | 2013-02-20 12:59:53 -0500 |
| commit | bf023ecfcaf114c410759f375073e78b0871c120 (patch) | |
| tree | 71498b3d5181414892aaa2a0f632142724968d72 /fs/btrfs/volumes.c | |
| parent | Btrfs: remove unused extent io tree ops V2 (diff) | |
| download | linux-dev-bf023ecfcaf114c410759f375073e78b0871c120.tar.xz linux-dev-bf023ecfcaf114c410759f375073e78b0871c120.zip | |
Btrfs: eliminate a use-after-free in btrfs_balance()
Commit 5af3e8cc introduced a use-after-free at volumes.c:3139: bctl is freed
above in __cancel_balance() in all cases except for balance pause. Fix this
by moving the offending check a couple statements above, the meaning of the
check is preserved.
Reported-by: Chris Mason <chris.mason@fusionio.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/volumes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 305b6a63ab1f..d778e9666597 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3195,6 +3195,11 @@ int btrfs_balance(struct btrfs_balance_control *bctl, mutex_lock(&fs_info->balance_mutex); atomic_dec(&fs_info->balance_running); + if (bctl->sys.flags & BTRFS_BALANCE_ARGS_CONVERT) { + fs_info->num_tolerated_disk_barrier_failures = + btrfs_calc_num_tolerated_disk_barrier_failures(fs_info); + } + if (bargs) { memset(bargs, 0, sizeof(*bargs)); update_ioctl_balance_args(fs_info, 0, bargs); @@ -3205,11 +3210,6 @@ int btrfs_balance(struct btrfs_balance_control *bctl, __cancel_balance(fs_info); } - if (bctl->sys.flags & BTRFS_BALANCE_ARGS_CONVERT) { - fs_info->num_tolerated_disk_barrier_failures = - btrfs_calc_num_tolerated_disk_barrier_failures(fs_info); - } - wake_up(&fs_info->balance_wait_q); return ret; |