Commit 511d25d6 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots 



The userspace can trigger "vmalloc size %lu allocation failure: exceeds
total pages" via the KVM_SET_USER_MEMORY_REGION ioctl.

This silences the warning by checking the limit before calling vzalloc()
and returns ENOMEM if failed.

This does not call underlying valloc helpers as __vmalloc_node() is only
exported when CONFIG_TEST_VMALLOC_MODULE and __vmalloc_node_range() is
not exported at all.

Spotted by syzkaller.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
[mpe: Use 'size' for the variable rather than 'cb']
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210901084512.1658628-1-aik@ozlabs.ru
parent f6a19877

arch/powerpc/kvm/book3s_hv.c

+6 −2
Original line number Diff line number Diff line
@@ -4872,8 +4872,12 @@ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm, 
	unsigned long npages = mem->memory_size >> PAGE_SHIFT;



	if (change == KVM_MR_CREATE) {

		slot->arch.rmap = vzalloc(array_size(npages,

					  sizeof(*slot->arch.rmap)));

		unsigned long size = array_size(npages, sizeof(*slot->arch.rmap));



		if ((size >> PAGE_SHIFT) > totalram_pages())

			return -ENOMEM;



		slot->arch.rmap = vzalloc(size);

		if (!slot->arch.rmap)

			return -ENOMEM;

	}