Skip to contentSkip to conversation

Tainted cleanup

PATCH New Alexey Dobriyan 1 participant 1 message Sep 26, 2008

Subsystems (17)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Tainted cleanup

* extrace tainted code in separate place: kernel/tainted.c and include/linux/tainted.h .

The former won't mess with panic code, the latter won't add useless stuff to kernel.h which is very often included header.

* export tainted.h to userspace

taint values are userspace-visible via kernel.tainted sysctl, a program in theory can monitor its value for oopses, warnings et al which is more reliable than printk ring-buffer.

---

 arch/alpha/kernel/traps.c                |    1 
 arch/arm/kernel/process.c                |    1 
 arch/arm/kernel/traps.c                  |    1 
 arch/avr32/kernel/process.c              |    1 
 arch/avr32/kernel/traps.c                |    1 
 arch/blackfin/kernel/traps.c             |    1 
 arch/ia64/kernel/process.c               |    1 
 arch/ia64/kernel/traps.c                 |    1 
 arch/m68k/kernel/process.c               |    1 
 arch/m68k/kernel/traps.c                 |    1 
 arch/m68knommu/kernel/process.c          |    1 
 arch/m68knommu/kernel/traps.c            |    1 
 arch/mips/kernel/traps.c                 |    1 
 arch/mips/sgi-ip27/ip27-nmi.c            |    1 
 arch/parisc/kernel/traps.c               |    1 
 arch/powerpc/kernel/process.c            |    1 
 arch/powerpc/kernel/traps.c              |    1 
 arch/s390/kernel/traps.c                 |    1 
 arch/sh/kernel/process_32.c              |    1 
 arch/sh/kernel/traps_32.c                |    1 
 arch/sparc/kernel/process.c              |    1 
 arch/sparc/kernel/traps.c                |    1 
 arch/sparc64/kernel/process.c            |    1 
 arch/sparc64/kernel/setup.c              |    1 
 arch/sparc64/kernel/traps.c              |    1 
 arch/um/sys-i386/sysrq.c                 |    1 
 arch/um/sys-x86_64/sysrq.c               |    1 
 arch/x86/kernel/cpu/mcheck/k7.c          |    1 
 arch/x86/kernel/cpu/mcheck/mce_64.c      |    1 
 arch/x86/kernel/cpu/mcheck/non-fatal.c   |    1 
 arch/x86/kernel/cpu/mcheck/p4.c          |    1 
 arch/x86/kernel/cpu/mcheck/p5.c          |    1 
 arch/x86/kernel/cpu/mcheck/p6.c          |    1 
 arch/x86/kernel/cpu/mcheck/therm_throt.c |    1 
 arch/x86/kernel/cpu/mcheck/winchip.c     |    1 
 arch/x86/kernel/process_32.c             |    1 
 arch/x86/kernel/process_64.c             |    1 
 arch/x86/kernel/smpboot.c                |    1 
 arch/x86/kernel/traps_32.c               |    1 
 arch/x86/kernel/traps_64.c               |    1 
 arch/xtensa/kernel/traps.c               |    1 
 drivers/acpi/osl.c                       |    1 
 include/linux/Kbuild                     |    1 
 include/linux/kernel.h                   |   14 --------
 include/linux/tainted.h                  |   21 +++++++++++++
 kernel/Makefile                          |    1 
 kernel/module.c                          |    1 
 kernel/panic.c                           |   46 -----------------------------
 kernel/softlockup.c                      |    1 
 kernel/sysctl.c                          |    1 
 kernel/tainted.c                         |   49 +++++++++++++++++++++++++++++++
 lib/bug.c                                |    1 
 mm/page_alloc.c                          |    1 
 53 files changed, 120 insertions(+), 59 deletions(-)
arch/alpha/kernel/traps.c +1 -0
@@ -11,6 +11,7 @@
 #include <linux/jiffies.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/tainted.h>
 #include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
arch/arm/kernel/process.c +1 -0
@@ -26,6 +26,7 @@
 #include <linux/cpu.h>
 #include <linux/elfcore.h>
 #include <linux/pm.h>
+#include <linux/tainted.h>
 #include <linux/tick.h>
 #include <linux/utsname.h>
 
arch/arm/kernel/traps.c +1 -0
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/spinlock.h>
+#include <linux/tainted.h>
 #include <linux/personality.h>
 #include <linux/kallsyms.h>
 #include <linux/delay.h>
arch/avr32/kernel/process.c +1 -0
@@ -11,6 +11,7 @@
 #include <linux/fs.h>
 #include <linux/ptrace.h>
 #include <linux/reboot.h>
+#include <linux/tainted.h>
 #include <linux/tick.h>
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
arch/avr32/kernel/traps.c +1 -0
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/sched.h>
+#include <linux/tainted.h>
 #include <linux/uaccess.h>
 
 #include <asm/addrspace.h>
arch/blackfin/kernel/traps.c +1 -0
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/fs.h>
+#include <linux/tainted.h>
 #include <asm/traps.h>
 #include <asm/cacheflush.h>
 #include <asm/blackfin.h>
arch/ia64/kernel/process.c +1 -0
@@ -21,6 +21,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/stddef.h>
+#include <linux/tainted.h>
 #include <linux/thread_info.h>
 #include <linux/unistd.h>
 #include <linux/efi.h>
arch/ia64/kernel/traps.c +1 -0
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/tainted.h>
 #include <linux/tty.h>
 #include <linux/vt_kern.h>		/* For unblank_screen() */
 #include <linux/module.h>       /* for EXPORT_SYMBOL */
arch/m68k/kernel/process.c +1 -0
@@ -19,6 +19,7 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/stddef.h>
+#include <linux/tainted.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
arch/m68k/kernel/traps.c +1 -0
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/user.h>
 #include <linux/string.h>
+#include <linux/tainted.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/ptrace.h>
arch/m68knommu/kernel/process.c +1 -0
@@ -24,6 +24,7 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
+#include <linux/tainted.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
arch/m68knommu/kernel/traps.c +1 -0
@@ -25,6 +25,7 @@
 #include <linux/a.out.h>
 #include <linux/user.h>
 #include <linux/string.h>
+#include <linux/tainted.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/ptrace.h>
arch/mips/kernel/traps.c +1 -0
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/spinlock.h>
+#include <linux/tainted.h>
 #include <linux/kallsyms.h>
 #include <linux/bootmem.h>
 #include <linux/interrupt.h>
arch/mips/sgi-ip27/ip27-nmi.c +1 -0
@@ -3,6 +3,7 @@
 #include <linux/nodemask.h>
 #include <linux/spinlock.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 #include <asm/atomic.h>
 #include <asm/sn/types.h>
 #include <asm/sn/addrs.h>
arch/parisc/kernel/traps.c +1 -0
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/spinlock.h>
+#include <linux/tainted.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/console.h>
arch/powerpc/kernel/process.c +1 -0
@@ -20,6 +20,7 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/stddef.h>
+#include <linux/tainted.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
arch/powerpc/kernel/traps.c +1 -0
@@ -22,6 +22,7 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
+#include <linux/tainted.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
arch/s390/kernel/traps.c +1 -0
@@ -25,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/seq_file.h>
+#include <linux/tainted.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/kdebug.h>
arch/sh/kernel/process_32.c +1 -0
@@ -16,6 +16,7 @@
 #include <linux/kallsyms.h>
 #include <linux/kexec.h>
 #include <linux/kdebug.h>
+#include <linux/tainted.h>
 #include <linux/tick.h>
 #include <linux/reboot.h>
 #include <linux/fs.h>
arch/sh/kernel/traps_32.c +1 -0
@@ -15,6 +15,7 @@
 #include <linux/ptrace.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/tainted.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/io.h>
arch/sparc/kernel/process.c +1 -0
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
arch/sparc/kernel/traps.c +1 -0
@@ -14,6 +14,7 @@
 #include <linux/signal.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/tainted.h>
 #include <linux/kdebug.h>
 
 #include <asm/delay.h>
arch/sparc64/kernel/process.c +1 -0
@@ -21,6 +21,7 @@
 #include <linux/stddef.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
+#include <linux/tainted.h>
 #include <linux/user.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
arch/sparc64/kernel/setup.c +1 -0
@@ -13,6 +13,7 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
+#include <linux/tainted.h>
 #include <asm/smp.h>
 #include <linux/user.h>
 #include <linux/screen_info.h>
arch/sparc64/kernel/traps.c +1 -0
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/signal.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/kdebug.h>
arch/um/sys-i386/sysrq.c +1 -0
@@ -6,6 +6,7 @@
 #include "linux/kernel.h"
 #include "linux/smp.h"
 #include "linux/sched.h"
+#include "linux/tainted.h"
 #include "linux/kallsyms.h"
 #include "asm/ptrace.h"
 #include "sysrq.h"
arch/um/sys-x86_64/sysrq.c +1 -0
@@ -7,6 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/tainted.h>
 #include <linux/utsname.h>
 #include <asm/current.h>
 #include <asm/ptrace.h>
arch/x86/kernel/cpu/mcheck/k7.c +1 -0
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
arch/x86/kernel/cpu/mcheck/mce_64.c +1 -0
@@ -11,6 +11,7 @@
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/string.h>
+#include <linux/tainted.h>
 #include <linux/rcupdate.h>
 #include <linux/kallsyms.h>
 #include <linux/sysdev.h>
arch/x86/kernel/cpu/mcheck/non-fatal.c +1 -0
@@ -14,6 +14,7 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 #include <linux/module.h>
 
 #include <asm/processor.h>
arch/x86/kernel/cpu/mcheck/p4.c +1 -0
@@ -7,6 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
arch/x86/kernel/cpu/mcheck/p5.c +1 -0
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
arch/x86/kernel/cpu/mcheck/p6.c +1 -0
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
+#include <linux/tainted.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
arch/x86/kernel/cpu/mcheck/therm_throt.c +1 -0
@@ -20,6 +20,7 @@
 #include <asm/cpu.h>
 #include <linux/notifier.h>
 #include <linux/jiffies.h>
+#include <linux/tainted.h>
 #include <asm/therm_throt.h>
 
 /* How long to wait between reporting thermal events */
arch/x86/kernel/cpu/mcheck/winchip.c +1 -0
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/tainted.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
arch/x86/kernel/process_32.c +1 -0
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 #include <linux/stddef.h>
 #include <linux/slab.h>
+#include <linux/tainted.h>
 #include <linux/vmalloc.h>
 #include <linux/user.h>
 #include <linux/interrupt.h>
arch/x86/kernel/process_64.c +1 -0
@@ -25,6 +25,7 @@
 #include <linux/elfcore.h>
 #include <linux/smp.h>
 #include <linux/slab.h>
+#include <linux/tainted.h>
 #include <linux/user.h>
 #include <linux/interrupt.h>
 #include <linux/utsname.h>
arch/x86/kernel/smpboot.c +1 -0
@@ -43,6 +43,7 @@
 #include <linux/smp.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/tainted.h>
 #include <linux/percpu.h>
 #include <linux/bootmem.h>
 #include <linux/err.h>
arch/x86/kernel/traps_32.c +1 -0
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/ptrace.h>
 #include <linux/string.h>
+#include <linux/tainted.h>
 #include <linux/unwind.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
arch/x86/kernel/traps_64.c +1 -0
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/kallsyms.h>
 #include <linux/spinlock.h>
+#include <linux/tainted.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
 #include <linux/utsname.h>
arch/xtensa/kernel/traps.c +1 -0
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/stringify.h>
+#include <linux/tainted.h>
 #include <linux/kallsyms.h>
 #include <linux/delay.h>
 
drivers/acpi/osl.c +1 -0
@@ -44,6 +44,7 @@
 #include <linux/list.h>
 #include <linux/jiffies.h>
 #include <linux/semaphore.h>
+#include <linux/tainted.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
include/linux/Kbuild +1 -0
@@ -338,6 +338,7 @@ unifdef-y += stddef.h
 unifdef-y += string.h
 unifdef-y += synclink.h
 unifdef-y += sysctl.h
+unifdef-y += tainted.h
 unifdef-y += tcp.h
 unifdef-y += time.h
 unifdef-y += timex.h
include/linux/kernel.h +0 -14
@@ -235,9 +235,6 @@ extern int oops_in_progress;		/* If set, an oops, panic(), BUG() or die() is in
 extern int panic_timeout;
 extern int panic_on_oops;
 extern int panic_on_unrecovered_nmi;
-extern int tainted;
-extern const char *print_tainted(void);
-extern void add_taint(unsigned);
 extern int root_mountflags;
 
 /* Values used for system_state */
@@ -250,17 +247,6 @@ extern enum system_states {
 	SYSTEM_SUSPEND_DISK,
 } system_state;
 
-#define TAINT_PROPRIETARY_MODULE	(1<<0)
-#define TAINT_FORCED_MODULE		(1<<1)
-#define TAINT_UNSAFE_SMP		(1<<2)
-#define TAINT_FORCED_RMMOD		(1<<3)
-#define TAINT_MACHINE_CHECK		(1<<4)
-#define TAINT_BAD_PAGE			(1<<5)
-#define TAINT_USER			(1<<6)
-#define TAINT_DIE			(1<<7)
-#define TAINT_OVERRIDDEN_ACPI_TABLE	(1<<8)
-#define TAINT_WARN			(1<<9)
-
 extern void dump_stack(void) __cold;
 
 enum {

new file mode 100644

include/linux/tainted.h new file +21 -0
@@ -0,0 +1,21 @@
+#ifndef __TAINTED_H
+#define __TAINTED_H
+
+#define TAINT_PROPRIETARY_MODULE	(1<<0)
+#define TAINT_FORCED_MODULE		(1<<1)
+#define TAINT_UNSAFE_SMP		(1<<2)
+#define TAINT_FORCED_RMMOD		(1<<3)
+#define TAINT_MACHINE_CHECK		(1<<4)
+#define TAINT_BAD_PAGE			(1<<5)
+#define TAINT_USER			(1<<6)
+#define TAINT_DIE			(1<<7)
+#define TAINT_OVERRIDDEN_ACPI_TABLE	(1<<8)
+#define TAINT_WARN			(1<<9)
+
+#ifdef __KERNEL__
+extern int tainted;
+const char *print_tainted(void);
+void add_taint(unsigned);
+#endif
+
+#endif
kernel/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
 	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
 	    hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
 	    notifier.o ksysfs.o pm_qos_params.o sched_clock.o
+obj-y	+= tainted.o
 
 CFLAGS_REMOVE_sched.o = -mno-spe
 
kernel/module.c +1 -0
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/kallsyms.h>
 #include <linux/sysfs.h>
+#include <linux/tainted.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
kernel/panic.c +1 -45

64 lines not on this page · raw message

kernel/softlockup.c +1 -0
@@ -16,6 +16,7 @@
 #include <linux/lockdep.h>
 #include <linux/notifier.h>
 #include <linux/module.h>
+#include <linux/tainted.h>
 
 #include <asm/irq_regs.h>
 
kernel/sysctl.c +1 -0
@@ -23,6 +23,7 @@
 #include <linux/swap.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
+#include <linux/tainted.h>
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/ctype.h>

new file mode 100644

kernel/tainted.c new file +49 -0

49 lines not on this page · raw message

lib/bug.c +1 -0
@@ -40,6 +40,7 @@
 #include <linux/kernel.h>
 #include <linux/bug.h>
 #include <linux/sched.h>
+#include <linux/tainted.h>
 
 extern const struct bug_entry __start___bug_table[], __stop___bug_table[];
 
mm/page_alloc.c +1 -0
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
+#include <linux/tainted.h>
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>