Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: selftests: Fix mapping length truncation in m{,un}map()

max_mem_slots is now declared as uint32_t. The result of (0x200000 * 32767)
is unexpectedly truncated to be 0xffe00000, whilst we actually need to
allocate about, 63GB. Cast max_mem_slots to size_t in both mmap() and
munmap() to fix the length truncation.

We'll otherwise see the failure on arm64 thanks to the access_ok() checking
in __kvm_set_memory_region(), as the unmapped VA happen to go beyond the
task's allowed address space.

# ./set_memory_region_test
Allowed number of memory slots: 32767
Adding slots 0..32766, each memory region with 2048K size
==== Test Assertion Failure ====
set_memory_region_test.c:391: ret == 0
pid=94861 tid=94861 errno=22 - Invalid argument
1 0x00000000004015a7: test_add_max_memory_regions at set_memory_region_test.c:389
2 (inlined by) main at set_memory_region_test.c:426
3 0x0000ffffb8e67bdf: ?? ??:0
4 0x00000000004016db: _start at :?
KVM_SET_USER_MEMORY_REGION IOCTL failed,
rc: -1 errno: 22 slot: 2615

Fixes: 3bf0fcd75434 ("KVM: selftests: Speed up set_memory_region_test")
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Message-Id: <20210624070931.565-1-yuzenghui@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Zenghui Yu and committed by
Paolo Bonzini
309505dd 13311e74

+2 -2
+2 -2
tools/testing/selftests/kvm/set_memory_region_test.c
··· 376 376 pr_info("Adding slots 0..%i, each memory region with %dK size\n", 377 377 (max_mem_slots - 1), MEM_REGION_SIZE >> 10); 378 378 379 - mem = mmap(NULL, MEM_REGION_SIZE * max_mem_slots + alignment, 379 + mem = mmap(NULL, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment, 380 380 PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 381 381 TEST_ASSERT(mem != MAP_FAILED, "Failed to mmap() host"); 382 382 mem_aligned = (void *)(((size_t) mem + alignment - 1) & ~(alignment - 1)); ··· 401 401 TEST_ASSERT(ret == -1 && errno == EINVAL, 402 402 "Adding one more memory slot should fail with EINVAL"); 403 403 404 - munmap(mem, MEM_REGION_SIZE * max_mem_slots + alignment); 404 + munmap(mem, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment); 405 405 munmap(mem_extra, MEM_REGION_SIZE); 406 406 kvm_vm_free(vm); 407 407 }