18 files changed, 18 insertions, 0 deletions

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index d6e665d567bd..ec0f05e0d8ff 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -184,6 +184,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
 #endif
         printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
         dik_show_regs(regs, r9_15);
+        add_taint(TAINT_DIE);
         dik_show_trace((unsigned long *)(regs+1));
         dik_show_code((unsigned int *)regs->pc);
 
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 237f4999b9a1..f2114bcf09d5 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -249,6 +249,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
         bust_spinlocks(1);
         __die(str, err, thread, regs);
         bust_spinlocks(0);
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
 
         if (in_interrupt())
diff --git a/arch/arm26/kernel/traps.c b/arch/arm26/kernel/traps.c
index d594fb59e945..2911e2eae80e 100644
--- a/arch/arm26/kernel/traps.c
+++ b/arch/arm26/kernel/traps.c
@@ -185,6 +185,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
         printk("Internal error: %s: %x\n", str, err);
         printk("CPU: %d\n", smp_processor_id());
         show_regs(regs);
+        add_taint(TAINT_DIE);
         printk("Process %s (pid: %d, stack limit = 0x%p)\n",
                 current->comm, current->pid, end_of_stack(tsk));
 
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index aaa792815cd7..9a73ce7eb50f 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -56,6 +56,7 @@ void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)
         show_regs_log_lvl(regs, KERN_EMERG);
         show_stack_log_lvl(current, regs->sp, regs, KERN_EMERG);
         bust_spinlocks(0);
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
 
         if (in_interrupt())
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 28bd1c5163ec..18c1c285836d 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -433,6 +433,7 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         bust_spinlocks(0);
         die.lock_owner = -1;
+        add_taint(TAINT_DIE);
         spin_unlock_irqrestore(&die.lock, flags);
 
         if (!regs)
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 15ad85da15a9..3aeaf15e468b 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -69,6 +69,7 @@ die (const char *str, struct pt_regs *regs, long err)
 
         bust_spinlocks(0);
         die.lock_owner = -1;
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die.lock);
 
         if (panic_on_oops)
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index a27a4fa33296..4e2752a0e89b 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -1170,6 +1170,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)
         console_verbose();
         printk("%s: %08x\n",str,nr);
         show_registers(fp);
+        add_taint(TAINT_DIE);
         do_exit(SIGSEGV);
 }
 
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index bed5f47bf568..fde04e1757f7 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -83,6 +83,7 @@ void die_if_kernel(char *str, struct pt_regs *fp, int nr)
         printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
                 current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
         show_stack(NULL, (unsigned long *)fp);
+        add_taint(TAINT_DIE);
         do_exit(SIGSEGV);
 }
 
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 37c562c4c817..ce277cb34dd0 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -326,6 +326,7 @@ void __noreturn die(const char * str, struct pt_regs * regs)
 #endif /* CONFIG_MIPS_MT_SMTC */
         printk("%s[#%d]:\n", str, ++die_counter);
         show_registers(regs);
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
 
         if (in_interrupt())
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index f9bca2d74b38..bbf029a184ac 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -264,6 +264,7 @@ KERN_CRIT "                     ||     ||\n");
 
         show_regs(regs);
         dump_stack();
+        add_taint(TAINT_DIE);
 
         if (in_interrupt())
                 panic("Fatal exception in interrupt");
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 3b8427e6283d..2bb1cb911783 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -149,6 +149,7 @@ int die(const char *str, struct pt_regs *regs, long err)
 
         bust_spinlocks(0);
         die.lock_owner = -1;
+        add_taint(TAINT_DIE);
         spin_unlock_irqrestore(&die.lock, flags);
 
         if (kexec_should_crash(current) ||
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index 0eaef7c8378b..3f3b292eb773 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -92,6 +92,7 @@ int die(const char * str, struct pt_regs * fp, long err)
         if (nl)
                 printk("\n");
         show_regs(fp);
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
         /* do_exit() should take care of panic'ing from an interrupt
          * context so we don't handle it here
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 81e03b9c3841..8ec9def83ccb 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -262,6 +262,7 @@ void die(const char * str, struct pt_regs * regs, long err)
         print_modules();
         show_regs(regs);
         bust_spinlocks(0);
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
         if (in_interrupt())
                 panic("Fatal exception in interrupt");
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 05a40f3c30bf..502d43e4785c 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -103,6 +103,7 @@ void die(const char * str, struct pt_regs * regs, long err)
                          (unsigned long)task_stack_page(current));
 
         bust_spinlocks(0);
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
 
         if (kexec_should_crash(current))
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c
index dc9ffea2a4f7..3bc3bff51e08 100644
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@@ -101,6 +101,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
 
         printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter);
         show_regs(regs);
+        add_taint(TAINT_DIE);
 
         __SAVE; __SAVE; __SAVE; __SAVE;
         __SAVE; __SAVE; __SAVE; __SAVE;
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 00a9e3286c83..6ef2d299fb10 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -2225,6 +2225,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
         notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV);
         __asm__ __volatile__("flushw");
         __show_regs(regs);
+        add_taint(TAINT_DIE);
         if (regs->tstate & TSTATE_PRIV) {
                 struct reg_window *rw = (struct reg_window *)
                         (regs->u_regs[UREG_FP] + STACK_BIAS);
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 7fa155c394d9..6963b64a76ca 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -518,6 +518,7 @@ void __kprobes __die(const char * str, struct pt_regs * regs, long err)
         printk("\n");
         notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
         show_registers(regs);
+        add_taint(TAINT_DIE);
         /* Executive summary in case the oops scrolled away */
         printk(KERN_ALERT "RIP ");
         printk_address(regs->rip); 
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 693ab268485e..c5e62f9d9f50 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -482,6 +482,7 @@ void die(const char * str, struct pt_regs * regs, long err)
         if (!user_mode(regs))
                 show_stack(NULL, (unsigned long*)regs->areg[1]);
 
+        add_taint(TAINT_DIE);
         spin_unlock_irq(&die_lock);
 
         if (in_interrupt())