Skip to contentSkip to conversation

Patch "virtio: fix memory leak in virtqueue_add()" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Aug 30, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

virtio: fix memory leak in virtqueue_add()

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
virtio-fix-memory-leak-in-virtqueue_add.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 58625edf9e2515ed41dac2a24fa8004030a87b87 Mon Sep 17 00:00:00 2001

From: Wei Yongjun <[email protected]>
Date: Tue, 2 Aug 2016 14:16:31 +0000
Subject: virtio: fix memory leak in virtqueue_add()

From: Wei Yongjun <[email protected]>

commit 58625edf9e2515ed41dac2a24fa8004030a87b87 upstream.

When using the indirect buffers feature, 'desc' is allocated in virtqueue_add() but isn't freed before leaving on a ring full error, causing a memory leak.

For example, it seems rather clear that this can trigger with virtio net if mergeable buffers are not used.

---
 drivers/virtio/virtio_ring.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/virtio/virtio_ring.c +2 -0
@@ -239,6 +239,8 @@ static inline int virtqueue_add(struct v
 		 * host should service the ring ASAP. */
 		if (out_sgs)
 			vq->notify(&vq->vq);
+		if (indirect)
+			kfree(desc);
 		END_USE(vq);
 		return -ENOSPC;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/virtio-fix-memory-leak-in-virtqueue_add.patch