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

Commit a3633f67 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 rng buffix from Rusty Russell:
 "Simple virtio-rng fix."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio: rng: disallow multiple device registrations, fixes crashes
parents 7946844a e84e7a56

drivers/char/hw_random/virtio-rng.c

+11 −2
Original line number Diff line number Diff line
@@ -92,14 +92,22 @@ static int probe_common(struct virtio_device *vdev) 
{

	int err;



	if (vq) {

		/* We only support one device for now */

		return -EBUSY;

	}

	/* We expect a single virtqueue. */

	vq = virtio_find_single_vq(vdev, random_recv_done, "input");

	if (IS_ERR(vq))

		return PTR_ERR(vq);

	if (IS_ERR(vq)) {

		err = PTR_ERR(vq);

		vq = NULL;

		return err;

	}



	err = hwrng_register(&virtio_hwrng);

	if (err) {

		vdev->config->del_vqs(vdev);

		vq = NULL;

		return err;

	}
@@ -112,6 +120,7 @@ static void remove_common(struct virtio_device *vdev) 
	busy = false;

	hwrng_unregister(&virtio_hwrng);

	vdev->config->del_vqs(vdev);

	vq = NULL;

}



static int virtrng_probe(struct virtio_device *vdev)