kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] arch/i386/kernel/traps.c: fix sparse warnings

Browse source 
Signed-off-by: Alexey Dobriyan <adobriyan@mail.ru>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Domen Puncer 2005-06-25 14:58:44 -07:00 committed by Linus Torvalds
parent 29a1d2d1bc
commit 3f3ae3471f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,22 +235,22 @@ void show_registers(struct pt_regs *regs)
* time of the fault.. * time of the fault..
*/ */
if (in_kernel) { if (in_kernel) {
u8 *eip; u8 __user *eip;
printk("\nStack: "); printk("\nStack: ");
show_stack(NULL, (unsigned long*)esp); show_stack(NULL, (unsigned long*)esp);
printk("Code: "); printk("Code: ");
eip = (u8 *)regs->eip - 43; eip = (u8 __user *)regs->eip - 43;
for (i = 0; i < 64; i++, eip++) { for (i = 0; i < 64; i++, eip++) {
unsigned char c; unsigned char c;
if (eip < (u8 *)PAGE_OFFSET || __get_user(c, eip)) { if (eip < (u8 __user *)PAGE_OFFSET || __get_user(c, eip)) {
printk(" Bad EIP value."); printk(" Bad EIP value.");
break; break;
} }
if (eip == (u8 *)regs->eip) if (eip == (u8 __user *)regs->eip)
printk("<%02x> ", c); printk("<%02x> ", c);
else else
printk("%02x ", c); printk("%02x ", c);
@ -274,13 +274,13 @@ static void handle_BUG(struct pt_regs *regs)
if (eip < PAGE_OFFSET) if (eip < PAGE_OFFSET)
goto no_bug; goto no_bug;
if (__get_user(ud2, (unsigned short *)eip)) if (__get_user(ud2, (unsigned short __user *)eip))
goto no_bug; goto no_bug;
if (ud2 != 0x0b0f) if (ud2 != 0x0b0f)
goto no_bug; goto no_bug;
if (__get_user(line, (unsigned short *)(eip + 2))) if (__get_user(line, (unsigned short __user *)(eip + 2)))
goto bug; goto bug;
if (__get_user(file, (char **)(eip + 4)) || if (__get_user(file, (char * __user *)(eip + 4)) ||
(unsigned long)file < PAGE_OFFSET || __get_user(c, file)) (unsigned long)file < PAGE_OFFSET || __get_user(c, file))
file = "<bad filename>"; file = "<bad filename>";