rpms/kernel/devel linux-2.6.11-taint-check.patch, NONE, 1.1 kernel-2.6.spec, 1.1252, 1.1253

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22805

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.11-taint-check.patch 
Log Message:
check tainted bit on oops.


linux-2.6.11-taint-check.patch:
 arch/i386/kernel/traps.c |    5 ++++-
 include/linux/kernel.h   |    1 +
 kernel/panic.c           |    7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6.11-taint-check.patch ---
--- linux-2.6.11/kernel/panic.c~	2005-04-20 03:48:57.000000000 -0400
+++ linux-2.6.11/kernel/panic.c	2005-04-20 03:49:28.000000000 -0400
@@ -159,3 +159,10 @@ void add_taint(unsigned flag)
 	tainted |= flag;
 }
 EXPORT_SYMBOL(add_taint);
+
+int check_tainted(void)
+{
+	return tainted;
+}
+EXPORT_SYMBOL_GPL(check_tainted);
+
--- linux-2.6.11/include/linux/kernel.h~	2005-04-20 03:49:49.000000000 -0400
+++ linux-2.6.11/include/linux/kernel.h	2005-04-20 03:49:56.000000000 -0400
@@ -156,6 +156,7 @@ extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);
 extern void add_taint(unsigned);
+extern int check_tainted(void);
 
 #define crashdump_mode()       unlikely(netdump_mode || diskdump_mode)
 
--- linux-2.6.11/arch/i386/kernel/traps.c~	2005-04-20 03:57:00.000000000 -0400
+++ linux-2.6.11/arch/i386/kernel/traps.c	2005-04-20 03:58:23.000000000 -0400
@@ -182,7 +182,10 @@ void show_stack(struct task_struct *task
 			break;
 		if (i && ((i % 8) == 0))
 			printk("\n       ");
-		printk("%08lx ", *stack++);
+		if ((check_tainted() != 0) && (i==0))
+			printk("badc0ded");
+		else
+			printk("%08lx ", *stack++);
 	}
 	printk("\nCall Trace:\n");
 	show_trace(task, esp);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1252
retrieving revision 1.1253
diff -u -r1.1252 -r1.1253
--- kernel-2.6.spec	20 Apr 2005 07:10:04 -0000	1.1252
+++ kernel-2.6.spec	20 Apr 2005 08:01:31 -0000	1.1253
@@ -319,6 +319,7 @@
 Patch1740: linux-2.6.11-default-elevator.patch
 Patch1750: linux-2.6.11-firmware-timeout.patch
 Patch1760: linux-2.6.11-dentry-size.patch
+Patch1770: linux-2.6.11-taint-check.patch
 
 Patch2000: linux-2.6.11-vm-taint.patch
 Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch
@@ -708,6 +709,8 @@
 %patch1750 -p1
 # Adjust struct dentry size for 32/64bit.
 %patch1760 -p1
+# Check tainted bit on oops.
+%patch1770 -p1
 
 #
 # VM related fixes.