[PULL,v2,21/44] libvhost-user: fix VHOST_USER_REM_MEM_REG skipping mmap_addr

Commit Message

Michael S. Tsirkin Oct. 20, 2021, 10:20 a.m. UTC

From: David Hildenbrand <[e-mail]>

We end up not copying the mmap_addr of all existing regions, resulting
in a SEGFAULT once we actually try to map/access anything within our
memory regions.

Fixes: 875b9fd97b34 ("Support individual region unmap in libvhost-user")
Cc: [e-mail]
Cc: Michael S. Tsirkin <[e-mail]>
Cc: Raphael Norwitz <[e-mail]>
Cc: "Marc-André Lureau" <[e-mail]>
Cc: Stefan Hajnoczi <[e-mail]>
Cc: Paolo Bonzini <[e-mail]>
Cc: Coiby Xu <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Michael S. Tsirkin <[e-mail]>
Signed-off-by: Michael S. Tsirkin <[e-mail]>
Reviewed-by: Raphael Norwitz <[e-mail]>
Reviewed-by: Stefan Hajnoczi <[e-mail]>
---
 subprojects/libvhost-user/libvhost-user.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index bf09693255..787f4d2d4f 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -816,6 +816,7 @@  vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
             shadow_regions[j].gpa = dev->regions[i].gpa;
             shadow_regions[j].size = dev->regions[i].size;
             shadow_regions[j].qva = dev->regions[i].qva;
+            shadow_regions[j].mmap_addr = dev->regions[i].mmap_addr;
             shadow_regions[j].mmap_offset = dev->regions[i].mmap_offset;
             j++;
         } else {