From: Greg Kroah-Hartman Date: Tue, 30 Aug 2016 10:48:05 +0000 (+0200) Subject: delete broken 3.14 virtio patch X-Git-Tag: v3.14.78~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbe82ecba5f49c3565e349a502f91621ee978a9a;p=thirdparty%2Fkernel%2Fstable-queue.git delete broken 3.14 virtio patch --- diff --git a/queue-3.14/series b/queue-3.14/series index b84137fa4ea..1354f3d0adc 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -1,4 +1,3 @@ x86-mm-disable-preemption-during-cr3-read-write.patch arm64-define-at_vector_size_arch-for-arch_dlinfo.patch parisc-fix-order-of-erefused-define-in-errno.h.patch -virtio-fix-memory-leak-in-virtqueue_add.patch diff --git a/queue-3.14/virtio-fix-memory-leak-in-virtqueue_add.patch b/queue-3.14/virtio-fix-memory-leak-in-virtqueue_add.patch deleted file mode 100644 index 26c877c6cdc..00000000000 --- a/queue-3.14/virtio-fix-memory-leak-in-virtqueue_add.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 58625edf9e2515ed41dac2a24fa8004030a87b87 Mon Sep 17 00:00:00 2001 -From: Wei Yongjun -Date: Tue, 2 Aug 2016 14:16:31 +0000 -Subject: virtio: fix memory leak in virtqueue_add() - -From: Wei Yongjun - -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. - -Signed-off-by: Wei Yongjun -Signed-off-by: Michael S. Tsirkin -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/virtio/virtio_ring.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/virtio/virtio_ring.c -+++ b/drivers/virtio/virtio_ring.c -@@ -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; - }