diff options
author | Miao Xie <miaox@cn.fujitsu.com> | 2014-09-03 09:35:43 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-09-17 16:38:44 -0400 |
commit | 67a2c45ee7f4f250458279a2e1244679c5d9735c (patch) | |
tree | 0f1806d2aead6af9629bb701101b75b28863b986 /fs/btrfs/volumes.c | |
parent | adbbb8631beda8e4e5d2c964b8b47e04cfa0a2ae (diff) |
Btrfs: fix use-after-free problem of the device during device replace
The problem is:
Task0(device scan task) Task1(device replace task)
scan_one_device()
mutex_lock(&uuid_mutex)
device = find_device()
mutex_lock(&device_list_mutex)
lock_chunk()
rm_and_free_source_device
unlock_chunk()
mutex_unlock(&device_list_mutex)
check device
Destroying the target device if device replace fails also has the same problem.
We fix this problem by locking uuid_mutex during destroying source device or
target device, just like the device remove operation.
It is a temporary solution, we can fix this problem and make the code more
clear by atomic counter in the future.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index d28e1761fdeb..a15c8ac5d5b3 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -50,7 +50,7 @@ static void __btrfs_reset_dev_stats(struct btrfs_device *dev); | |||
50 | static void btrfs_dev_stat_print_on_error(struct btrfs_device *dev); | 50 | static void btrfs_dev_stat_print_on_error(struct btrfs_device *dev); |
51 | static void btrfs_dev_stat_print_on_load(struct btrfs_device *device); | 51 | static void btrfs_dev_stat_print_on_load(struct btrfs_device *device); |
52 | 52 | ||
53 | static DEFINE_MUTEX(uuid_mutex); | 53 | DEFINE_MUTEX(uuid_mutex); |
54 | static LIST_HEAD(fs_uuids); | 54 | static LIST_HEAD(fs_uuids); |
55 | 55 | ||
56 | static void lock_chunks(struct btrfs_root *root) | 56 | static void lock_chunks(struct btrfs_root *root) |
@@ -1867,6 +1867,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, | |||
1867 | { | 1867 | { |
1868 | struct btrfs_device *next_device; | 1868 | struct btrfs_device *next_device; |
1869 | 1869 | ||
1870 | mutex_lock(&uuid_mutex); | ||
1870 | WARN_ON(!tgtdev); | 1871 | WARN_ON(!tgtdev); |
1871 | mutex_lock(&fs_info->fs_devices->device_list_mutex); | 1872 | mutex_lock(&fs_info->fs_devices->device_list_mutex); |
1872 | if (tgtdev->bdev) { | 1873 | if (tgtdev->bdev) { |
@@ -1886,6 +1887,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, | |||
1886 | call_rcu(&tgtdev->rcu, free_device); | 1887 | call_rcu(&tgtdev->rcu, free_device); |
1887 | 1888 | ||
1888 | mutex_unlock(&fs_info->fs_devices->device_list_mutex); | 1889 | mutex_unlock(&fs_info->fs_devices->device_list_mutex); |
1890 | mutex_unlock(&uuid_mutex); | ||
1889 | } | 1891 | } |
1890 | 1892 | ||
1891 | static int btrfs_find_device_by_path(struct btrfs_root *root, char *device_path, | 1893 | static int btrfs_find_device_by_path(struct btrfs_root *root, char *device_path, |