summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-08 04:49:33 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-08 04:49:33 +0300
commit1b88accf6a659c46d5c8e68912896f112bf882bb (patch)
treed3ef4efd224430eaf1870b146eaa73a43f8ee603 /drivers
parent851710a8096131129ad1da79a47d385c4926d114 (diff)
parente82df670235138575b37ff0ec24412a471efd97f (diff)
downloadlinux-1b88accf6a659c46d5c8e68912896f112bf882bb.tar.xz
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/virtio/virtio_ring.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index eb30f3e09a47..71458f493cf8 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -428,8 +428,6 @@ unmap_release:
i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);
}
- vq->vq.num_free += total_sg;
-
if (indirect)
kfree(desc);