diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2018-03-07 17:49:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2018-03-07 17:49:33 -0800 |
| commit | 1b88accf6a659c46d5c8e68912896f112bf882bb (patch) | |
| tree | d3ef4efd224430eaf1870b146eaa73a43f8ee603 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | virtio_ring: fix num_free handling in error case (diff) | |
| download | linux-1b88accf6a659c46d5c8e68912896f112bf882bb.tar.gz linux-1b88accf6a659c46d5c8e68912896f112bf882bb.tar.bz2 linux-1b88accf6a659c46d5c8e68912896f112bf882bb.zip | |
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.c | 2 |
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); |