vfio: get rid of vfio_device_put()/vfio_group_get_device* races
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 18 Aug 2012 01:29:06 +0000 (21:29 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 22 Aug 2012 14:26:13 +0000 (10:26 -0400)
we really need to make sure that dropping the last reference happens
under the group->device_lock; otherwise a loop (under device_lock)
might find vfio_device instance that is being freed right now, has
already dropped the last reference and waits on device_lock to exclude
the sucker from the list.

Acked-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/vfio/vfio.c

index 92b85676e6bed3ca908866c74b62fab197876757..887ae43276bbdc381140dbd61e70cf1aa562f26d 100644 (file)
@@ -396,7 +396,6 @@ static void vfio_device_release(struct kref *kref)
                                                  struct vfio_device, kref);
        struct vfio_group *group = device->group;
 
-       mutex_lock(&group->device_lock);
        list_del(&device->group_next);
        mutex_unlock(&group->device_lock);
 
@@ -412,7 +411,7 @@ static void vfio_device_release(struct kref *kref)
 static void vfio_device_put(struct vfio_device *device)
 {
        struct vfio_group *group = device->group;
-       kref_put(&device->kref, vfio_device_release);
+       kref_put_mutex(&device->kref, vfio_device_release, &group->device_lock);
        vfio_group_put(group);
 }