Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] i386: handle_BUG(): don't print garbage if debug info unavailable

Browse source 
handle_BUG() tries to print file and line number even when they're not
available (CONFIG_DEBUG_BUGVERBOSE is not set.) Change this to print a
message stating info is unavailable instead of printing a misleading
message.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Chuck Ebbert 2006-07-14 00:23:58 -07:00 • committed by Linus Torvalds
parent c38c8db722
commit b701533109
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
arch/i386/kernel/traps.c
View file

@ -324,35 +324,35 @@ void show_registers(struct pt_regs *regs)
static void handle_BUG(struct pt_regs *regs) static void handle_BUG(struct pt_regs *regs)
{ {
unsigned long eip = regs->eip;
unsigned short ud2; unsigned short ud2;
unsigned short line;
char *file;
char c;
unsigned long eip;
eip = regs->eip;
if (eip < PAGE_OFFSET) if (eip < PAGE_OFFSET)
goto no_bug; return;
if (__get_user(ud2, (unsigned short __user *)eip)) if (__get_user(ud2, (unsigned short __user *)eip))
goto no_bug; return;
if (ud2 != 0x0b0f) if (ud2 != 0x0b0f)
goto no_bug; return;
if (__get_user(line, (unsigned short __user *)(eip + 2)))
goto bug;
if (__get_user(file, (char * __user *)(eip + 4)) ||
(unsigned long)file < PAGE_OFFSET || __get_user(c, file))
file = "<bad filename>";
printk(KERN_EMERG "------------[ cut here ]------------\n"); printk(KERN_EMERG "------------[ cut here ]------------\n");
printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
no_bug: #ifdef CONFIG_DEBUG_BUGVERBOSE
return; do {
unsigned short line;
char *file;
char c;
/* Here we know it was a BUG but file-n-line is unavailable */ if (__get_user(line, (unsigned short __user *)(eip + 2)))
bug: break;
printk(KERN_EMERG "Kernel BUG\n"); if (__get_user(file, (char * __user *)(eip + 4)) ||
(unsigned long)file < PAGE_OFFSET || __get_user(c, file))
file = "<bad filename>";
printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
return;
} while (0);
#endif
printk(KERN_EMERG "Kernel BUG at [verbose debug info unavailable]\n");
} }
/* This is gone through when something in the kernel /* This is gone through when something in the kernel