diff options
| author | Tiwei Bie <tiwei.bie@intel.com> | 2018-02-23 19:41:30 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-15 10:54:32 +0100 |
| commit | 583cc79b7380178b924f9a85a23272de2cbd5c6f (patch) | |
| tree | 6b2ca6ef9c1f7730d3bb0418f95921ea66fcecff /drivers/virtio | |
| parent | 5f9113db06a4799fadd432b36c951aab8abd5af8 (diff) | |
| download | linux-stable-583cc79b7380178b924f9a85a23272de2cbd5c6f.tar.gz linux-stable-583cc79b7380178b924f9a85a23272de2cbd5c6f.tar.bz2 linux-stable-583cc79b7380178b924f9a85a23272de2cbd5c6f.zip | |
virtio_ring: fix num_free handling in error case
commit e82df670235138575b37ff0ec24412a471efd97f upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/virtio')
| -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); |