rpms/kernel/F-7 kernel-2.6.spec, 1.3213, 1.3214 linux-2.6-devmem.patch, 1.12, 1.13

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7235

Modified Files:
	kernel-2.6.spec linux-2.6-devmem.patch 
Log Message:
* Tue Jun 05 2007 Dave Jones <davej at redhat.com>
- Allow kdump to read /proc/kcore. (#241362)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3213
retrieving revision 1.3214
diff -u -r1.3213 -r1.3214
--- kernel-2.6.spec	4 Jun 2007 16:19:52 -0000	1.3213
+++ kernel-2.6.spec	5 Jun 2007 04:44:46 -0000	1.3214
@@ -2426,6 +2426,9 @@
 %endif
 
 %changelog
+* Tue Jun 05 2007 Dave Jones <davej at redhat.com>
+- Allow kdump to read /proc/kcore. (#241362)
+
 * Mon Jun 04 2007 Dave Jones <davej at redhat.com>
 - Switch 'Prevent going idle with softirq pending' patch to upstream variant.
 

linux-2.6-devmem.patch:

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-devmem.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-devmem.patch	23 Nov 2006 22:00:34 -0000	1.12
+++ linux-2.6-devmem.patch	5 Jun 2007 04:44:47 -0000	1.13
@@ -632,3 +632,33 @@
  #endif /* __KERNEL__ */
  
  #endif /* _X86_64_PAGE_H */
+--- linux-2.6.20.noarch/fs/proc/kcore.c.orig	2007-06-04 15:44:29.000000000 -0400
++++ linux-2.6.20.noarch/fs/proc/kcore.c	2007-06-04 15:48:57.000000000 -0400
+@@ -23,10 +23,10 @@
+ #include <asm/io.h>
+ 
+ #define CORE_STR "CORE"
+-
++unsigned int allow_kcore_access = 0;
+ static int open_kcore(struct inode * inode, struct file * filp)
+ {
+-	return -EPERM;
++	return (capable(CAP_SYS_RAWIO) && allow_kcore_access) ? 0 : -EPERM;
+ }
+ 
+ static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
+--- linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c.orig	2007-06-04 15:50:52.000000000 -0400
++++ linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c	2007-06-04 15:52:14.000000000 -0400
+@@ -236,10 +236,12 @@
+  * Useful for holding code to do something appropriate
+  * after a kernel panic.
+  */
++extern int allow_kcore_access;
+ static int __init setup_crashkernel(char *arg)
+ {
+ 	unsigned long size, base;
+ 	char *p;
++	allow_kcore_access = 1; /*enable ability to read /proc/kcore*/
+ 	if (!arg)
+ 		return -EINVAL;
+ 	size = memparse(arg, &p);