diff options
author | Masoud Asgharifard Sharbiani <masouds@google.com> | 2007-07-22 05:12:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:03:37 -0400 |
commit | abd4f7505bafdd6c5319fe3cb5caf9af6104e17a (patch) | |
tree | a543fce720331dbf6194a2c0471f36b7727b9736 /arch/x86_64/mm | |
parent | 5fa63fccc579ac609fc7f86d29ccb3a2edf910d7 (diff) |
x86: i386-show-unhandled-signals-v3
This patch makes the i386 behave the same way that x86_64 does when a
segfault happens. A line gets printed to the kernel log so that tools
that need to check for failures can behave more uniformly between
debug.show_unhandled_signals sysctl variable to 0 (or by doing echo 0 >
/proc/sys/debug/exception-trace)
Also, all of the lines being printed are now using printk_ratelimit() to
deny the ability of DoS from a local user with a program like the
following:
main()
{
while (1)
if (!fork()) *(int *)0 = 0;
}
This new revision also includes the fix that Andrew did which got rid of
new sysctl that was added to the system in earlier versions of this.
Also, 'show-unhandled-signals' sysctl has been renamed back to the old
'exception-trace' to avoid breakage of people's scripts.
AK: Enabling by default for i386 will be likely controversal, but let's see what happens
AK: Really folks, before complaining just fix your segfaults
AK: I bet this will find a lot of silent issues
Signed-off-by: Masoud Sharbiani <masouds@google.com>
Signed-off-by: Andi Kleen <ak@suse.de>
[ Personally, I've found the complaints useful on x86-64, so I'm all for
this. That said, I wonder if we could do it more prettily.. -Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/mm')
-rw-r--r-- | arch/x86_64/mm/fault.c | 15 | ||||
-rw-r--r-- | arch/x86_64/mm/init.c | 33 |
2 files changed, 3 insertions, 45 deletions
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index 2074bddd4f04..5e9ac70c135e 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
@@ -221,16 +221,6 @@ static int is_errata93(struct pt_regs *regs, unsigned long address) | |||
221 | return 0; | 221 | return 0; |
222 | } | 222 | } |
223 | 223 | ||
224 | int unhandled_signal(struct task_struct *tsk, int sig) | ||
225 | { | ||
226 | if (is_init(tsk)) | ||
227 | return 1; | ||
228 | if (tsk->ptrace & PT_PTRACED) | ||
229 | return 0; | ||
230 | return (tsk->sighand->action[sig-1].sa.sa_handler == SIG_IGN) || | ||
231 | (tsk->sighand->action[sig-1].sa.sa_handler == SIG_DFL); | ||
232 | } | ||
233 | |||
234 | static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, | 224 | static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, |
235 | unsigned long error_code) | 225 | unsigned long error_code) |
236 | { | 226 | { |
@@ -302,7 +292,7 @@ static int vmalloc_fault(unsigned long address) | |||
302 | } | 292 | } |
303 | 293 | ||
304 | static int page_fault_trace; | 294 | static int page_fault_trace; |
305 | int exception_trace = 1; | 295 | int show_unhandled_signals = 1; |
306 | 296 | ||
307 | /* | 297 | /* |
308 | * This routine handles page faults. It determines the address, | 298 | * This routine handles page faults. It determines the address, |
@@ -494,7 +484,8 @@ bad_area_nosemaphore: | |||
494 | (address >> 32)) | 484 | (address >> 32)) |
495 | return; | 485 | return; |
496 | 486 | ||
497 | if (exception_trace && unhandled_signal(tsk, SIGSEGV)) { | 487 | if (show_unhandled_signals && unhandled_signal(tsk, SIGSEGV) && |
488 | printk_ratelimit()) { | ||
498 | printk( | 489 | printk( |
499 | "%s%s[%d]: segfault at %016lx rip %016lx rsp %016lx error %lx\n", | 490 | "%s%s[%d]: segfault at %016lx rip %016lx rsp %016lx error %lx\n", |
500 | tsk->pid > 1 ? KERN_INFO : KERN_EMERG, | 491 | tsk->pid > 1 ? KERN_INFO : KERN_EMERG, |
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index 381c2ecd407e..88678e82e23d 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c | |||
@@ -697,39 +697,6 @@ int kern_addr_valid(unsigned long addr) | |||
697 | return pfn_valid(pte_pfn(*pte)); | 697 | return pfn_valid(pte_pfn(*pte)); |
698 | } | 698 | } |
699 | 699 | ||
700 | #ifdef CONFIG_SYSCTL | ||
701 | #include <linux/sysctl.h> | ||
702 | |||
703 | static ctl_table debug_table2[] = { | ||
704 | { | ||
705 | .ctl_name = 99, | ||
706 | .procname = "exception-trace", | ||
707 | .data = &exception_trace, | ||
708 | .maxlen = sizeof(int), | ||
709 | .mode = 0644, | ||
710 | .proc_handler = proc_dointvec | ||
711 | }, | ||
712 | {} | ||
713 | }; | ||
714 | |||
715 | static ctl_table debug_root_table2[] = { | ||
716 | { | ||
717 | .ctl_name = CTL_DEBUG, | ||
718 | .procname = "debug", | ||
719 | .mode = 0555, | ||
720 | .child = debug_table2 | ||
721 | }, | ||
722 | {} | ||
723 | }; | ||
724 | |||
725 | static __init int x8664_sysctl_init(void) | ||
726 | { | ||
727 | register_sysctl_table(debug_root_table2); | ||
728 | return 0; | ||
729 | } | ||
730 | __initcall(x8664_sysctl_init); | ||
731 | #endif | ||
732 | |||
733 | /* A pseudo VMA to allow ptrace access for the vsyscall page. This only | 700 | /* A pseudo VMA to allow ptrace access for the vsyscall page. This only |
734 | covers the 64bit vsyscall page now. 32bit has a real VMA now and does | 701 | covers the 64bit vsyscall page now. 32bit has a real VMA now and does |
735 | not need special handling anymore. */ | 702 | not need special handling anymore. */ |