From: Avi Kivity <avi@qumranet.com>
Date: Mon, 26 Feb 2007 14:29:43 +0000 (+0200)
Subject: KVM: Fix bogus failure in kvm.ko module initialization
X-Git-Tag: v2.6.21-rc3~105
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=58e690e6fd47a682b49aed3510443d6797a03021;p=linux-2.6-omap-h63xx.git

KVM: Fix bogus failure in kvm.ko module initialization

A bogus 'return r' can cause an otherwise successful module load to fail.
This both denies users the use of kvm, and it also denies them the use of
their machine, as it leaves a filesystem registered with its callbacks
pointing into now-freed module memory.

Fix by returning a zero like a good module.

Thanks to Richard Lucassen <mailinglists@lucassen.org> (?) for reporting
the problem and for providing access to a machine which exhibited it.

Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index e48b4d7a350..ca82ba359e1 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2540,7 +2540,7 @@ static __init int kvm_init(void)
 	bad_page_address = page_to_pfn(bad_page) << PAGE_SHIFT;
 	memset(__va(bad_page_address), 0, PAGE_SIZE);
 
-	return r;
+	return 0;
 
 out:
 	kvm_exit_debug();