Commit 0bfaa9c5 authored Jul 07, 2014 by Eric Sandeen Committed by Chris Mason Jul 19, 2014

btrfs: test for valid bdev before kobj removal in btrfs_rm_device



commit 99994cde 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>

parent 98ce2ded

fs/btrfs/volumes.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

		call_rcu(&device->rcu, free_device);