summaryrefslogtreecommitdiffstats
path: root/drivers/virtio
diff options
context:
space:
mode:
authorTiwei Bie <tiwei.bie@intel.com>2018-02-23 19:41:30 +0800
committerMichael S. Tsirkin <mst@redhat.com>2018-03-01 18:53:38 +0200
commite82df670235138575b37ff0ec24412a471efd97f (patch)
tree7bc79c1cdbaeee6e5ca9eba7a900bea363bda2f4 /drivers/virtio
parent4a3928c6f8a53fa1aed28ccba227742486e8ddcb (diff)
downloadlinux-stable-e82df670235138575b37ff0ec24412a471efd97f.tar.gz
linux-stable-e82df670235138575b37ff0ec24412a471efd97f.tar.bz2
linux-stable-e82df670235138575b37ff0ec24412a471efd97f.zip
virtio_ring: fix num_free handling in error case
The vq->vq.num_free hasn't been changed when error happens, so it shouldn't be changed when handling the error. Fixes: 780bc7903a32 ("virtio_ring: Support DMA APIs") Cc: Andy Lutomirski <luto@kernel.org> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Tiwei Bie <tiwei.bie@intel.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/virtio')
-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);