Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6ea1df9 authored by Suman Anna's avatar Suman Anna Committed by Greg Kroah-Hartman
Browse files

virtio_ring: Fix mem leak with vring_new_virtqueue() 



commit f13f09a12cbd0c7b776e083c5d008b6c6a9c4e0b upstream.

The functions vring_new_virtqueue() and __vring_new_virtqueue() are used
with split rings, and any allocations within these functions are managed
outside of the .we_own_ring flag. The commit cbeedb72 ("virtio_ring:
allocate desc state for split ring separately") allocates the desc state
within the __vring_new_virtqueue() but frees it only when the .we_own_ring
flag is set. This leads to a memory leak when freeing such allocated
virtqueues with the vring_del_virtqueue() function.

Fix this by moving the desc_state free code outside the flag and only
for split rings. Issue was discovered during testing with remoteproc
and virtio_rpmsg.

Fixes: cbeedb72 ("virtio_ring: allocate desc state for split ring separately")
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Link: https://lore.kernel.org/r/20200224212643.30672-1-s-anna@ti.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b758686c

drivers/virtio/virtio_ring.c

+2 −2
Original line number Diff line number Diff line
@@ -2203,10 +2203,10 @@ void vring_del_virtqueue(struct virtqueue *_vq) 
					 vq->split.queue_size_in_bytes,

					 vq->split.vring.desc,

					 vq->split.queue_dma_addr);



			kfree(vq->split.desc_state);

		}

	}

	if (!vq->packed_ring)

		kfree(vq->split.desc_state);

	list_del(&_vq->list);

	kfree(vq);

}