Commit 6512e34b authored by Lidong Chen's avatar Lidong Chen Committed by Paolo Bonzini
Browse files

util/main-loop: Fix incorrect assertion 



The check for poll_fds in g_assert() was incorrect. The correct assertion
should check "n_poll_fds + w->num <= ARRAY_SIZE(poll_fds)" because the
subsequent for-loop is doing access to poll_fds[n_poll_fds + i] where i
is in [0, w->num).  This could happen with a very high number of file
descriptors and/or wait objects.

Signed-off-by: default avatarLidong Chen <lidong.chen@oracle.com>
Suggested-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Suggested-by: default avatarLiam Merwick <liam.merwick@oracle.com>
Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
Reviewed-by: default avatarLi Qiang <liq3ea@gmail.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <ded30967982811617ce7f0222d11228130c198b7.1560806687.git.lidong.chen@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1c598ab2

util/main-loop.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int os_host_main_loop_wait(int64_t timeout) 
    g_main_context_prepare(context, &max_priority);

    n_poll_fds = g_main_context_query(context, max_priority, &poll_timeout,

                                      poll_fds, ARRAY_SIZE(poll_fds));

    g_assert(n_poll_fds <= ARRAY_SIZE(poll_fds));

    g_assert(n_poll_fds + w->num <= ARRAY_SIZE(poll_fds));



    for (i = 0; i < w->num; i++) {

        poll_fds[n_poll_fds + i].fd = (DWORD_PTR)w->events[i];