From: Sjur Brændeland <sjur.brandel...@stericsson.com>

Fix panic in virtio.c when CONFIG_DEBUG_SLAB is set.
device_unregister() drops reference to device so put_device()
could invoke release callback. In this case the release
callback will free the device. Make sure we don't access
device after unregister by fetching the device index
before calling unregister.

Signed-off-by: Sjur Brændeland <sjur.brandel...@stericsson.com>
cc: Guzman Lugo, Fernadndo <fernando.l...@ti.com>
cc: Michael S. Tsirkin <m...@redhat.com>
cc: Rusty Russell <ru...@rustcorp.com.au>
cc: Ohad Ben-Cohen <o...@wizery.com>
cc: virtualization@lists.linux-foundation.org
cc: linux-ker...@vger.kernel.org
---
 drivers/virtio/virtio.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index c3b3f7f..faee112 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -225,8 +225,15 @@ EXPORT_SYMBOL_GPL(register_virtio_device);
 
 void unregister_virtio_device(struct virtio_device *dev)
 {
+       /*
+        * device_unregister() drops reference to device so put_device could
+        * invoke release callback. In case that callback will free the device,
+        * make sure we don't access device after this call.
+        */
+
+       int index = dev->index;
        device_unregister(&dev->dev);
-       ida_simple_remove(&virtio_index_ida, dev->index);
+       ida_simple_remove(&virtio_index_ida, index);
 }
 EXPORT_SYMBOL_GPL(unregister_virtio_device);
 
-- 
1.7.5.4

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to