From: YueHaibing <yuehaibing@huawei.com>
Date: Tue, 12 Mar 2019 07:06:53 +0000 (+0800)
Subject: virtio_ring: Fix potential mem leak in virtqueue_add_indirect_packed
X-Git-Tag: v5.2-rc1~63^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df0bfe7501e9319546ea380d39674a4179e059c3;p=thirdparty%2Fkernel%2Flinux.git

virtio_ring: Fix potential mem leak in virtqueue_add_indirect_packed

'desc' should be freed before leaving from err handing path.

Fixes: 1ce9e6055fa0 ("virtio_ring: introduce packed ring support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
stable@vger.kernel.org
---

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 5df92c308286d..021010424fa5c 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1004,6 +1004,7 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq,
 
 	if (unlikely(vq->vq.num_free < 1)) {
 		pr_debug("Can't add buf len 1 - avail = 0\n");
+		kfree(desc);
 		END_USE(vq);
 		return -ENOSPC;
 	}