ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qtest: Fix crash if SIGABRT during qtest_init() 

If an assertion fails during qtest_init() the SIGABRT handler is
invoked.  This is the correct behavior since we need to kill the QEMU
process to avoid leaking it when the test dies.

The global_qtest pointer used by the SIGABRT handler is currently only
assigned after qtest_init() returns.  This results in a segfault if an
assertion failure occurs during qtest_init().

Move global_qtest assignment inside qtest_init().  Not pretty but let's
face it - the signal handler depends on global state.

Reported-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Stefan Hajnoczi 2014-03-13 10:41:34 +01:00 committed by Andreas Färber
parent f33f991185
commit cb201b4872
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/libqtest.c
View File

@ -120,7 +120,7 @@ QTestState *qtest_init(const char *extra_args)
qemu_binary = getenv("QTEST_QEMU_BINARY"); qemu_binary = getenv("QTEST_QEMU_BINARY");
g_assert(qemu_binary != NULL); g_assert(qemu_binary != NULL);
s = g_malloc(sizeof(*s)); global_qtest = s = g_malloc(sizeof(*s));
socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid()); socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid()); qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
@ -181,6 +181,7 @@ QTestState *qtest_init(const char *extra_args)
void qtest_quit(QTestState *s) void qtest_quit(QTestState *s)
{ {
sigaction(SIGABRT, &s->sigact_old, NULL); sigaction(SIGABRT, &s->sigact_old, NULL);
global_qtest = NULL;
kill_qemu(s); kill_qemu(s);
close(s->fd); close(s->fd);

4
tests/libqtest.h
View File

@ -335,8 +335,7 @@ void qtest_add_func(const char *str, void (*fn));
*/ */
static inline QTestState *qtest_start(const char *args) static inline QTestState *qtest_start(const char *args)
{ {
global_qtest = qtest_init(args); return qtest_init(args);
return global_qtest;
} }
/** /**
@ -347,7 +346,6 @@ static inline QTestState *qtest_start(const char *args)
static inline void qtest_end(void) static inline void qtest_end(void)
{ {
qtest_quit(global_qtest); qtest_quit(global_qtest);
global_qtest = NULL;
} }
/** /**