Commit 1b88accf authored by Linus Torvalds's avatar Linus Torvalds

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
parents 851710a8 e82df670
...@@ -428,8 +428,6 @@ static inline int virtqueue_add(struct virtqueue *_vq, ...@@ -428,8 +428,6 @@ static inline int virtqueue_add(struct virtqueue *_vq,
i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next); i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);
} }
vq->vq.num_free += total_sg;
if (indirect) if (indirect)
kfree(desc); kfree(desc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment