Commit 237242bd authored Nov 09, 2012 by Cornelia Huck Committed by Rusty Russell Nov 09, 2012

virtio: Don't access index after unregister.



Virtio wants to release used indices after the corresponding
virtio device has been unregistered. However, virtio does not
hold an extra reference, giving up its last reference with
device_unregister(), making accessing dev->index afterwards
invalid.

I actually saw problems when testing my (not-yet-merged)
virtio-ccw code:

- device_add virtio-net,id=xxx
-> creates device virtio<n> with n>0

- device_del xxx
-> deletes virtio<n>, but calls ida_simple_remove with an
   index of 0

- device_add virtio-net,id=xxx
-> tries to add virtio0, which is still in use...

So let's save the index we want to release before calling
device_unregister().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Cc: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

parent f6a79af8

drivers/virtio/virtio.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -225,8 +225,10 @@ EXPORT_SYMBOL_GPL(register_virtio_device);

		void unregister_virtio_device(struct virtio_device *dev)
		{
		int index = dev->index; /* save for after device release */

		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);

Admin message