7267786620
Fix s390 issues, build from source rpm, and qemu-testsuite failures. OBS-URL: https://build.opensuse.org/request/show/530641 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=366
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From fbb04572c563144614fe3c3cb87c4e289c18e3d2 Mon Sep 17 00:00:00 2001
|
|
From: Liang Yan <lyan@suse.com>
|
|
Date: Fri, 22 Sep 2017 18:55:33 -0400
|
|
Subject: [PATCH] chardev/baum: fix baum that releases brlapi twice
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Error process of baum_chr_open needs to set brlapi null, so it won't
|
|
get released twice in char_braille_finalize, which will cause
|
|
"/usr/bin/qemu-system-x86_64: double free or corruption (!prev)"
|
|
|
|
Signed-off-by: Liang Yan <lyan@suse.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
(cherry picked from commit 98e8790326d732fc79f0c133d9658f4761ba9cb7)
|
|
[LY: BSC#1060045]
|
|
Signed-off-by: Liang Yan <lyan@suse.com>
|
|
---
|
|
chardev/baum.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/chardev/baum.c b/chardev/baum.c
|
|
index 302dd9666c..67fd783a59 100644
|
|
--- a/chardev/baum.c
|
|
+++ b/chardev/baum.c
|
|
@@ -643,6 +643,7 @@ static void baum_chr_open(Chardev *chr,
|
|
error_setg(errp, "brlapi__openConnection: %s",
|
|
brlapi_strerror(brlapi_error_location()));
|
|
g_free(handle);
|
|
+ baum->brlapi = NULL;
|
|
return;
|
|
}
|
|
baum->deferred_init = 0;
|