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

Commit 2856db70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull virtio fixes from Rusty Russell:
 "virtio-rng corner case fixes, with cc:stable.

  Survived a few days in linux-next"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio-rng: skip reading when we start to remove the device
  virtio-rng: fix stuck of hot-unplugging busy device
parents 2324067f f4981956

drivers/char/hw_random/virtio-rng.c

+7 −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,9 @@ 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);

	vi->busy = false;

	if (vi->hwrng_register_done)