Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: use __vcalloc for very large allocations

Browse Source 
Allocations whose size is related to the memslot size can be arbitrarily
large.  Do not use kvzalloc/kvcalloc, as those are limited to "not crazy"
sizes that fit in 32 bits.

Cc: stable@vger.kernel.org
Fixes: 7661809d49 ("mm: don't allow oversized kvmalloc() calls")
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-03-08 04:49:37 -05:00
parent 3000f2e2fc
commit 37b2a6510a
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kvm/book3s_hv_uvmem.c
View File

@ -251,7 +251,7 @@ int kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot)
p = kzalloc(sizeof(*p), GFP_KERNEL); p = kzalloc(sizeof(*p), GFP_KERNEL);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
p->pfns = vzalloc(array_size(slot->npages, sizeof(*p->pfns))); p->pfns = vcalloc(slot->npages, sizeof(*p->pfns));
if (!p->pfns) { if (!p->pfns) {
kfree(p); kfree(p);
return -ENOMEM; return -ENOMEM;

7
arch/x86/kvm/mmu/page_track.c
View File

@ -47,8 +47,8 @@ int kvm_page_track_create_memslot(struct kvm *kvm,
continue; continue;
slot->arch.gfn_track[i] = slot->arch.gfn_track[i] =
kvcalloc(npages, sizeof(*slot->arch.gfn_track[i]), __vcalloc(npages, sizeof(*slot->arch.gfn_track[i]),
GFP_KERNEL_ACCOUNT); GFP_KERNEL_ACCOUNT);
if (!slot->arch.gfn_track[i]) if (!slot->arch.gfn_track[i])
goto track_free; goto track_free;
} }
@ -75,7 +75,8 @@ int kvm_page_track_write_tracking_alloc(struct kvm_memory_slot *slot)
if (slot->arch.gfn_track[KVM_PAGE_TRACK_WRITE]) if (slot->arch.gfn_track[KVM_PAGE_TRACK_WRITE])
return 0; return 0;
gfn_track = kvcalloc(slot->npages, sizeof(*gfn_track), GFP_KERNEL_ACCOUNT); gfn_track = __vcalloc(slot->npages, sizeof(*gfn_track),
GFP_KERNEL_ACCOUNT);
if (gfn_track == NULL) if (gfn_track == NULL)
return -ENOMEM; return -ENOMEM;

4
arch/x86/kvm/x86.c
View File

@ -11838,7 +11838,7 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages)
if (slot->arch.rmap[i]) if (slot->arch.rmap[i])
continue; continue;
slot->arch.rmap[i] = kvcalloc(lpages, sz, GFP_KERNEL_ACCOUNT); slot->arch.rmap[i] = __vcalloc(lpages, sz, GFP_KERNEL_ACCOUNT);
if (!slot->arch.rmap[i]) { if (!slot->arch.rmap[i]) {
memslot_rmap_free(slot); memslot_rmap_free(slot);
return -ENOMEM; return -ENOMEM;
@ -11875,7 +11875,7 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm,
lpages = __kvm_mmu_slot_lpages(slot, npages, level); lpages = __kvm_mmu_slot_lpages(slot, npages, level);
linfo = kvcalloc(lpages, sizeof(*linfo), GFP_KERNEL_ACCOUNT); linfo = __vcalloc(lpages, sizeof(*linfo), GFP_KERNEL_ACCOUNT);
if (!linfo) if (!linfo)
goto out_free; goto out_free;

4
virt/kvm/kvm_main.c
View File

@ -1274,9 +1274,9 @@ static int kvm_vm_release(struct inode *inode, struct file *filp)
*/ */
static int kvm_alloc_dirty_bitmap(struct kvm_memory_slot *memslot) static int kvm_alloc_dirty_bitmap(struct kvm_memory_slot *memslot)
{ {
unsigned long dirty_bytes = 2 * kvm_dirty_bitmap_bytes(memslot); unsigned long dirty_bytes = kvm_dirty_bitmap_bytes(memslot);
memslot->dirty_bitmap = kvzalloc(dirty_bytes, GFP_KERNEL_ACCOUNT); memslot->dirty_bitmap = __vcalloc(2, dirty_bytes, GFP_KERNEL_ACCOUNT);
if (!memslot->dirty_bitmap) if (!memslot->dirty_bitmap)
return -ENOMEM; return -ENOMEM;