Blame qemu.git-fdfcc9aeea1492f4b819a24c94dfb678145b1bf9.patch
|
 |
6e0c7aa |
From fdfcc9aeea1492f4b819a24c94dfb678145b1bf9 Mon Sep 17 00:00:00 2001
|
|
|
6e0c7aa |
From: Li Qiang <liqiang6-s@360.cn>
|
|
|
6e0c7aa |
Date: Mon, 17 Oct 2016 14:13:58 +0200
|
|
|
6e0c7aa |
Subject: [PATCH] 9pfs: fix memory leak in v9fs_write
|
|
|
6e0c7aa |
|
|
|
6e0c7aa |
If an error occurs when marshalling the transfer length to the guest, the
|
|
|
6e0c7aa |
v9fs_write() function doesn't free an IO vector, thus leading to a memory
|
|
|
6e0c7aa |
leak. This patch fixes the issue.
|
|
|
6e0c7aa |
|
|
|
6e0c7aa |
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
|
|
|
6e0c7aa |
Reviewed-by: Greg Kurz <groug@kaod.org>
|
|
|
6e0c7aa |
[groug, rephrased the changelog]
|
|
|
6e0c7aa |
Signed-off-by: Greg Kurz <groug@kaod.org>
|
|
|
6e0c7aa |
---
|
|
|
6e0c7aa |
hw/9pfs/9p.c | 2 +-
|
|
|
6e0c7aa |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
6e0c7aa |
|
|
|
f8e0147 |
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
|
|
|
6e0c7aa |
index d43a552..e88cf25 100644
|
|
|
f8e0147 |
--- a/hw/9pfs/9p.c
|
|
|
f8e0147 |
+++ b/hw/9pfs/9p.c
|
|
|
6e0c7aa |
@@ -2090,7 +2090,7 @@ static void coroutine_fn v9fs_write(void *opaque)
|
|
|
6e0c7aa |
offset = 7;
|
|
|
6e0c7aa |
err = pdu_marshal(pdu, offset, "d", total);
|
|
|
6e0c7aa |
if (err < 0) {
|
|
|
6e0c7aa |
- goto out;
|
|
|
6e0c7aa |
+ goto out_qiov;
|
|
|
6e0c7aa |
}
|
|
|
6e0c7aa |
err += offset;
|
|
|
6e0c7aa |
trace_v9fs_write_return(pdu->tag, pdu->id, total, err);
|
|
|
6e0c7aa |
--
|
|
|
6e0c7aa |
1.7.0.4
|
|
|
6e0c7aa |
|