vfio: get rid of vfio_device_put()/vfio_group_get_device* races

[pandora-kernel.git] / drivers / vfio / vfio.c

diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 92b8567..887ae43 100644 (file)
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -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);
 }