]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: Fix use-after-free when cleaning up fs_devs with a single stale device
authorNikolay Borisov <nborisov@suse.com>
Tue, 30 Jan 2018 14:07:37 +0000 (16:07 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 5 Feb 2018 16:15:14 +0000 (17:15 +0100)
Commit 4fde46f0cc71 ("Btrfs: free the stale device") introduced
btrfs_free_stale_device which iterates the device lists for all
registered btrfs filesystems and deletes those devices which aren't
mounted. In a btrfs_devices structure has only 1 device attached to it
and it is unused then btrfs_free_stale_devices will proceed to also free
the btrfs_fs_devices struct itself. Currently this leads to a use after
free since list_for_each_entry will try to perform a check on the
already freed memory to see if it has to terminate the loop.

The fix is to use 'break' when we know we are freeing the current
fs_devs.

Fixes: 4fde46f0cc71 ("Btrfs: free the stale device")
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/volumes.c

index b5036bd69e6a6432bf014b5fb8fb9e0c5baf495e..2ceb924ca0d630334ab81c33b24eef97194b5874 100644 (file)
@@ -645,6 +645,7 @@ static void btrfs_free_stale_devices(const char *path,
                                btrfs_sysfs_remove_fsid(fs_devs);
                                list_del(&fs_devs->list);
                                free_fs_devices(fs_devs);
+                               break;
                        } else {
                                fs_devs->num_devices--;
                                list_del(&dev->dev_list);