| From e82df670235138575b37ff0ec24412a471efd97f Mon Sep 17 00:00:00 2001 |
| From: Tiwei Bie <tiwei.bie@intel.com> |
| Date: Fri, 23 Feb 2018 19:41:30 +0800 |
| Subject: virtio_ring: fix num_free handling in error case |
| |
| From: Tiwei Bie <tiwei.bie@intel.com> |
| |
| 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> |
| |
| --- |
| drivers/virtio/virtio_ring.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- 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); |
| |
