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

torvalds · torvalds · commit 1b88accf6a65 · 2018-03-07T17:49:33.000-08:00
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
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
@@ -428,8 +428,6 @@ static inline int virtqueue_add(struct virtqueue *_vq,
 		i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);
 	}
 
-	vq->vq.num_free += total_sg;
-
 	if (indirect)
 		kfree(desc);
 

Original file line number	Diff line number	Diff line change
`@@ -428,8 +428,6 @@ static inline int virtqueue_add(struct virtqueue *_vq,`
`428`	`428`	`i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);`
`429`	`429`	`}`
`430`	`430`
`431`		`- vq->vq.num_free += total_sg;`
`432`		`-`
`433`	`431`	`if (indirect)`
`434`	`432`	`kfree(desc);`
`435`	`433`