summaryrefslogtreecommitdiffstats
path: root/migration
diff options
context:
space:
mode:
authorPeter Maydell2019-04-09 17:18:30 +0200
committerPeter Maydell2019-04-09 21:46:34 +0200
commitf151f8aca5cf5da24f6eb743a55a2233091ae532 (patch)
tree9fe159f34311d379875816838b8bc1d81a7c0877 /migration
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
downloadqemu-f151f8aca5cf5da24f6eb743a55a2233091ae532.tar.gz
qemu-f151f8aca5cf5da24f6eb743a55a2233091ae532.tar.xz
qemu-f151f8aca5cf5da24f6eb743a55a2233091ae532.zip
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>
Diffstat (limited to 'migration')
-rw-r--r--migration/ram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c
index f68beeeeff..1ca9ba77b6 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -851,7 +851,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
*/
if (packet->pages_alloc > p->pages->allocated) {
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);