commit 1b88accf6a659c46d5c8e68912896f112bf882bb
author Linus Torvalds <torvalds@linux-foundation.org> Wed Mar 07 17:49:33 2018 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Mar 07 17:49:33 2018 -0800
tree d3ef4efd224430eaf1870b146eaa73a43f8ee603
parent 851710a8096131129ad1da79a47d385c4926d114
parent e82df670235138575b37ff0ec24412a471efd97f

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio bugfix from Michael Tsirkin:
 "A bugfix for error handling in virtio"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_ring: fix num_free handling in error case

drivers/virtio/virtio_ring.c

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index eb30f3e..71458f4 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -428,8 +428,6 @@
 		i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);
 	}
 
-	vq->vq.num_free += total_sg;
-
 	if (indirect)
 		kfree(desc);