rpms/kernel/F-8 linux-2.6-upstream-kcore-access.patch, NONE, 1.1 kernel.spec, 1.437, 1.438

[Neil Horman (nhorman)]

Author: nhorman

Update of /cvs/extras/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2105

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-upstream-kcore-access.patch 
Log Message:
Restore kcore access to upstream behavior (bz 241362)

linux-2.6-upstream-kcore-access.patch:

--- NEW FILE linux-2.6-upstream-kcore-access.patch ---
diff -up linux-2.6.24.noarch/fs/proc/kcore.c.orig linux-2.6.24.noarch/fs/proc/kcore.c
--- linux-2.6.24.noarch/fs/proc/kcore.c.orig	2008-05-07 13:52:17.000000000 -0400
+++ linux-2.6.24.noarch/fs/proc/kcore.c	2008-05-07 13:53:05.000000000 -0400
@@ -23,10 +23,9 @@
 #include <asm/io.h>
 
 #define CORE_STR "CORE"
-unsigned int allow_kcore_access;
 static int open_kcore(struct inode * inode, struct file * filp)
 {
-	return (capable(CAP_SYS_RAWIO) && allow_kcore_access) ? 0 : -EPERM;
+	return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
 }
 
 static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
diff -up linux-2.6.24.noarch/arch/x86/kernel/setup_32.c.orig linux-2.6.24.noarch/arch/x86/kernel/setup_32.c
--- linux-2.6.24.noarch/arch/x86/kernel/setup_32.c.orig	2008-05-07 13:51:37.000000000 -0400
+++ linux-2.6.24.noarch/arch/x86/kernel/setup_32.c	2008-05-07 13:52:03.000000000 -0400
@@ -462,16 +462,12 @@ static inline unsigned long long get_tot
 }
 
 #ifdef CONFIG_KEXEC
-extern int allow_kcore_access;
-
 static void __init reserve_crashkernel(void)
 {
 	unsigned long long total_mem;
 	unsigned long long crash_size, crash_base;
 	int ret;
 
-	allow_kcore_access = 1;	/*enable ability to read /proc/kcore*/
-
 	total_mem = get_total_mem();
 
 	ret = parse_crashkernel(boot_command_line, total_mem,


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- kernel.spec	7 May 2008 04:45:40 -0000	1.437
+++ kernel.spec	7 May 2008 19:54:37 -0000	1.438
@@ -760,6 +760,8 @@
 
 # Patch up paranoid iret
 Patch3240: linux-2.6-paranoid-iret-crash-fix.patch
+# Return kcore access policy to upstream behavior (bz 241362)
+Patch3300: linux-2.6-upstream-kcore-access.patch
 
 %endif
 
@@ -1420,6 +1422,7 @@
 
 # Patch up paranoid iret (#431314)
 ApplyPatch linux-2.6-paranoid-iret-crash-fix.patch
+ApplyPatch linux-2.6-upstream-kcore-access.patch
 
 # SELinux perf patches
 
@@ -2016,6 +2019,9 @@
 
 
 %changelog
+* Wed May 07 2008 Neil Horman <nhorman at redhat.com> 
+- Return kcore access policy to upstream behavior (bz 241362)
+
 * Tue May 06 2008 Kyle McMartin <kmcmartin at redhat.com> 2.6.24.7-90
 - Linux 2.6.24.7