[PATCH v9 03/14] KVM: selftests: Add missing close and munmap in __vm_mem_region_delete()

[Ricardo Koller]

Deleting a memslot (when freeing a VM) is not closing the backing fd,
nor it's unmapping the alias mapping. Fix by adding the missing close
and munmap.

Reviewed-by: Andrew Jones <andrew.jo...@linux.dev>
Reviewed-by: Oliver Upton <oup...@google.com>
Reviewed-by: Ben Gardon <bgar...@google.com>
Signed-off-by: Ricardo Koller <ricar...@google.com>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c 
b/tools/testing/selftests/kvm/lib/kvm_util.c
index f1cb1627161f..19e37fb7de7c 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -586,6 +586,12 @@ static void __vm_mem_region_delete(struct kvm_vm *vm,
        sparsebit_free(&region->unused_phy_pages);
        ret = munmap(region->mmap_start, region->mmap_size);
        TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));
+       if (region->fd >= 0) {
+               /* There's an extra map when using shared memory. */
+               ret = munmap(region->mmap_alias, region->mmap_size);
+               TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));
+               close(region->fd);
+       }
 
        free(region);
 }
-- 
2.38.0.rc1.362.ged0d419d3c-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm