Commit f8762027 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

libqtest: Fix possible deadlock in qtest initialization 



'socket_accept' waits for QEMU to init its unix socket.
If QEMU encounters an error during command line parsing,
it can exit before initializing the communication channel.

Using a timeout for sockets fixes the issue.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent d2f69df7

tests/libqtest.c

+11 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "qapi/qmp/json-parser.h"



#define MAX_IRQ 256

#define SOCKET_TIMEOUT 5



QTestState *global_qtest;
@@ -78,12 +79,16 @@ static int socket_accept(int sock) 
    struct sockaddr_un addr;

    socklen_t addrlen;

    int ret;

    struct timeval timeout = { .tv_sec = SOCKET_TIMEOUT,

                               .tv_usec = 0 };



    setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (void *)&timeout,

               sizeof(timeout));



    addrlen = sizeof(addr);

    do {

        ret = accept(sock, (struct sockaddr *)&addr, &addrlen);

    } while (ret == -1 && errno == EINTR);

    g_assert_no_errno(ret);

    close(sock);



    return ret;
@@ -147,12 +152,16 @@ QTestState *qtest_init(const char *extra_args) 
    }



    s->fd = socket_accept(sock);

    if (s->fd >= 0) {

        s->qmp_fd = socket_accept(qmpsock);

    }

    unlink(socket_path);

    unlink(qmp_socket_path);

    g_free(socket_path);

    g_free(qmp_socket_path);



    g_assert(s->fd >= 0 && s->qmp_fd >= 0);



    s->rx = g_string_new("");

    for (i = 0; i < MAX_IRQ; i++) {

        s->irq_level[i] = false;