Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4981956 authored by Amos Kong's avatar Amos Kong Committed by Rusty Russell
Browse files

virtio-rng: skip reading when we start to remove the device 



Before we really unregister the hwrng device, reading will get stuck if
the virtio device is reset. We should return error for reading when we
start to remove the device.

Signed-off-by: default avatarAmos Kong <akong@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 3856e548

drivers/char/hw_random/virtio-rng.c

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct virtrng_info { 
	int index;

	bool busy;

	bool hwrng_register_done;

	bool hwrng_removed;

};
@@ -68,6 +69,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) 
	int ret;

	struct virtrng_info *vi = (struct virtrng_info *)rng->priv;



	if (vi->hwrng_removed)

		return -ENODEV;



	if (!vi->busy) {

		vi->busy = true;

		init_completion(&vi->have_data);
@@ -137,6 +141,7 @@ static void remove_common(struct virtio_device *vdev) 
{

	struct virtrng_info *vi = vdev->priv;



	vi->hwrng_removed = true;

	vi->data_avail = 0;

	complete(&vi->have_data);

	vdev->config->reset(vdev);