migration/ram.c: Fix use-after-free in multifd_recv_unfill_packet()

Coverity points out (CID 1400442) that in this code:

    if (packet->pages_alloc > p->pages->allocated) {
        multifd_pages_clear(p->pages);
        multifd_pages_init(packet->pages_alloc);
    }

we free p->pages in multifd_pages_clear() but continue to
use it in the following code. We also leak memory, because
multifd_pages_init() returns the pointer to a new MultiFDPages_t
struct but we are ignoring its return value.

Fix both of these bugs by adding the missing assignment of
the newly created struct to p->pages.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-id: 20190409151830.6024-1-peter.maydell@linaro.org
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Peter Maydell 2019-04-09 16:18:30 +01:00
parent 4b9a21c344
commit f151f8aca5

View File

@ -851,7 +851,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
*/ */
if (packet->pages_alloc > p->pages->allocated) { if (packet->pages_alloc > p->pages->allocated) {
multifd_pages_clear(p->pages); multifd_pages_clear(p->pages);
multifd_pages_init(packet->pages_alloc); p->pages = multifd_pages_init(packet->pages_alloc);
} }
p->pages->used = be32_to_cpu(packet->pages_used); p->pages->used = be32_to_cpu(packet->pages_used);