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-18 11:18:50 +0100 |
| commit | 4c5579483bd56aab3e009c8dac047b2051947299 (patch) | |
| tree | 7e30e766878358ceb9bd6cca461809b96e25157e /drivers/virtio | |
| parent | c0fac97933c1da286e770e1cf5d4419191401fdc (diff) | |
| download | linux-stable-4c5579483bd56aab3e009c8dac047b2051947299.tar.gz linux-stable-4c5579483bd56aab3e009c8dac047b2051947299.tar.bz2 linux-stable-4c5579483bd56aab3e009c8dac047b2051947299.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 489bfc61cf30..8977f40ea441 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -423,8 +423,6 @@ unmap_release: i = vq->vring.desc[i].next; } - vq->vq.num_free += total_sg; - if (indirect) kfree(desc); |