Commit 10b14cb7 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

x86, dumpstack: always call oops_exit from oops_end 



Always call oops_exit from oops_end, even if signr==0.

Also, move add_taint(TAINT_DIE) from __die to oops_end
on x86_64 and interchange two lines to make oops_end
more similar to the i386-version.

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0ed7a498

arch/x86/kernel/dumpstack_32.c

+1 −1
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) 
	__raw_spin_unlock(&die_lock);

	raw_local_irq_restore(flags);



	oops_exit();

	if (!signr)

		return;
@@ -325,7 +326,6 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) 
		panic("Fatal exception in interrupt");

	if (panic_on_oops)

		panic("Fatal exception");

	oops_exit();

	do_exit(signr);

}

arch/x86/kernel/dumpstack_64.c

+5 −6
Original line number Diff line number Diff line
@@ -461,22 +461,22 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) 
	if (regs && kexec_should_crash(current))

		crash_kexec(regs);



	die_owner = -1;

	bust_spinlocks(0);

	die_owner = -1;

	add_taint(TAINT_DIE);

	die_nest_count--;

	if (!die_nest_count)

		/* Nest count reaches zero, release the lock. */

		__raw_spin_unlock(&die_lock);

	raw_local_irq_restore(flags);

	if (!signr) {

	oops_exit();



	if (!signr)

		return;

	}

	if (in_interrupt())

		panic("Fatal exception in interrupt");

	if (panic_on_oops)

		panic("Fatal exception");

	oops_exit();

	do_exit(signr);

}
@@ -499,7 +499,6 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
		return 1;



	show_registers(regs);

	add_taint(TAINT_DIE);

	/* Executive summary in case the oops scrolled away */

	printk(KERN_ALERT "RIP ");

	printk_address(regs->ip, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE