From: Darrick J. Wong <djwong@us.ibm.com>
Date: Thu, 14 Aug 2008 22:43:33 +0000 (-0700)
Subject: x86, msr: fix NULL pointer deref due to msr_open on nonexistent CPUs
X-Git-Tag: v2.6.27-rc4~52^2~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=967060d00d7ab8e992963a966cd3d18156c02d55;p=linux-2.6-omap-h63xx.git

x86, msr: fix NULL pointer deref due to msr_open on nonexistent CPUs

msr_open tests for someone trying to open a device for a nonexistent CPU.
However, the function always returns 0, not ret like it should, hence
userspace can BUG the kernel trivially.  This bug was introduced by the
cdev lock_kernel pushdown patch last May.

The BUG can be reproduced with these commands:

# mknod fubar c 202 8 <-- pick a number less than NR_CPUS that is not
                          the number of an online CPU
# cat fubar

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 9fd80955244..e4393808688 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -131,7 +131,7 @@ static int msr_open(struct inode *inode, struct file *file)
 		ret = -EIO;	/* MSR not supported */
 out:
 	unlock_kernel();
-	return 0;
+	return ret;
 }
 
 /*