aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-02-20 14:06:20 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-14 11:32:04 -0700
commit1244d244aea7290c80cea240baa7e5b93b439dc8 (patch)
tree25b13b39df23053539f76227110df839d931010f /fs/btrfs
parent21a3473f1b9aaf7a458b43acb5237794e8cecadb (diff)
downloadkernel_samsung_smdk4412-1244d244aea7290c80cea240baa7e5b93b439dc8.zip
kernel_samsung_smdk4412-1244d244aea7290c80cea240baa7e5b93b439dc8.tar.gz
kernel_samsung_smdk4412-1244d244aea7290c80cea240baa7e5b93b439dc8.tar.bz2
btrfs: Init io_lock after cloning btrfs device struct
commit 1cba0cdf5e4dbcd9e5fa5b54d7a028e55e2ca057 upstream. __btrfs_close_devices() clones btrfs device structs with memcpy(). Some of the fields in the clone are reinitialized, but it's missing to init io_lock. In mainline this goes unnoticed, but on RT it leaves the plist pointing to the original about to be freed lock struct. Initialize io_lock after cloning, so no references to the original struct are left. Reported-and-tested-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Chris Mason <chris.mason@fusionio.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/volumes.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 43baaf0..06c8ced 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -512,6 +512,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
new_device->writeable = 0;
new_device->in_fs_metadata = 0;
new_device->can_discard = 0;
+ spin_lock_init(&new_device->io_lock);
list_replace_rcu(&device->dev_list, &new_device->dev_list);
call_rcu(&device->rcu, free_device);