This patch backports bugfix patch series from qemu upstream v4.1.1 Signed-off-by: Ying Fang <fangying1@huawei.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 57fdf4a13ff16d9d48a43f02a5e7b42e3d264f83 Mon Sep 17 00:00:00 2001
|
|
From: Markus Armbruster <armbru@redhat.com>
|
|
Date: Thu, 22 Aug 2019 15:38:46 +0200
|
|
Subject: [PATCH] pr-manager: Fix invalid g_free() crash bug
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
pr_manager_worker() passes its @opaque argument to g_free(). Wrong;
|
|
it points to pr_manager_worker()'s automatic @data. Broken when
|
|
commit 2f3a7ab39be converted @data from heap- to stack-allocated. Fix
|
|
by deleting the g_free().
|
|
|
|
Fixes: 2f3a7ab39bec4ba8022dc4d42ea641165b004e3e
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit 6b9d62c2a9e83bbad73fb61406f0ff69b46ff6f3)
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
scsi/pr-manager.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/scsi/pr-manager.c b/scsi/pr-manager.c
|
|
index ee43663576..0c866e8698 100644
|
|
--- a/scsi/pr-manager.c
|
|
+++ b/scsi/pr-manager.c
|
|
@@ -39,7 +39,6 @@ static int pr_manager_worker(void *opaque)
|
|
int fd = data->fd;
|
|
int r;
|
|
|
|
- g_free(data);
|
|
trace_pr_manager_run(fd, hdr->cmdp[0], hdr->cmdp[1]);
|
|
|
|
/* The reference was taken in pr_manager_execute. */
|
|
--
|
|
2.23.0
|