Commit cb201b48 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Andreas Färber
Browse files

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: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Tested-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f33f9911

tests/libqtest.c

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ QTestState *qtest_init(const char *extra_args) 
    qemu_binary = getenv("QTEST_QEMU_BINARY");

    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());

    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)

{

    sigaction(SIGABRT, &s->sigact_old, NULL);

    global_qtest = NULL;



    kill_qemu(s);

    close(s->fd);

tests/libqtest.h

+1 −3
Original line number Diff line number Diff line
@@ -335,8 +335,7 @@ void qtest_add_func(const char *str, void (*fn)); 
 */

static inline QTestState *qtest_start(const char *args)

{

    global_qtest = qtest_init(args);

    return global_qtest;

    return qtest_init(args);

}



/**
@@ -347,7 +346,6 @@ static inline QTestState *qtest_start(const char *args) 
static inline void qtest_end(void)

{

    qtest_quit(global_qtest);

    global_qtest = NULL;

}



/**