Commit 55a54f79 authored Dec 29, 2006 by Avi Kivity Committed by Linus Torvalds Dec 30, 2006

[PATCH] KVM: Fix oops on oom



__free_page() doesn't like a NULL argument, so check before calling it.  A
NULL can only happen if memory is exhausted during allocation of a memory
slot.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent c68876fd

drivers/kvm/kvm_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ static void kvm_free_physmem_slot(struct kvm_memory_slot *free,
		if (!dont \|\| free->phys_mem != dont->phys_mem)
		if (free->phys_mem) {
		for (i = 0; i < free->npages; ++i)
		if (free->phys_mem[i])
		__free_page(free->phys_mem[i]);
		vfree(free->phys_mem);
		}