diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2014-07-07 19:34:49 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-07-19 20:49:44 +0200 |
| commit | 0bfaa9c5cb479cebc24979b384374fe47500b4c9 (patch) | |
| tree | 4c9a5a9f514ea6d955856b9ed28a3b63b3460b42 | |
| parent | Btrfs: fix abnormal long waiting in fsync (diff) | |
| download | linux-0bfaa9c5cb479cebc24979b384374fe47500b4c9.tar.xz linux-0bfaa9c5cb479cebc24979b384374fe47500b4c9.zip | |
btrfs: test for valid bdev before kobj removal in btrfs_rm_device
commit 99994cd btrfs: dev delete should remove sysfs entry
added a btrfs_kobj_rm_device, which dereferences device->bdev...
right after we check whether device->bdev might be NULL.
I don't honestly know if it's possible to have a NULL device->bdev
here, but assuming that it is (given the test), we need to move
the kobject removal to be under that test.
(Coverity spotted this)
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Chris Mason <clm@fb.com>
| -rw-r--r-- | fs/btrfs/volumes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 6104676857f5..6cb82f62cb7c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1680,11 +1680,11 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) if (device->bdev == root->fs_info->fs_devices->latest_bdev) root->fs_info->fs_devices->latest_bdev = next_device->bdev; - if (device->bdev) + if (device->bdev) { device->fs_devices->open_devices--; - - /* remove sysfs entry */ - btrfs_kobj_rm_device(root->fs_info, device); + /* remove sysfs entry */ + btrfs_kobj_rm_device(root->fs_info, device); + } call_rcu(&device->rcu, free_device); |