Re: [patch 07/10 with proper signed-off] arch/i386/kernel/traps.c: fix sparse warnings

From: Domen Puncer
Date: Sun Mar 20 2005 - 06:18:49 EST



Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxx>
Signed-off-by: Domen Puncer <domen@xxxxxxxxxxxx>
---


kj-domen/arch/i386/kernel/traps.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)

diff -puN arch/i386/kernel/traps.c~sparse-arch_i386_kernel_traps arch/i386/kernel/traps.c
--- kj/arch/i386/kernel/traps.c~sparse-arch_i386_kernel_traps 2005-03-20 12:11:18.000000000 +0100
+++ kj-domen/arch/i386/kernel/traps.c 2005-03-20 12:11:18.000000000 +0100
@@ -233,22 +233,22 @@ void show_registers(struct pt_regs *regs
* time of the fault..
*/
if (in_kernel) {
- u8 *eip;
+ u8 __user *eip;

printk("\nStack: ");
show_stack(NULL, (unsigned long*)esp);

printk("Code: ");

- eip = (u8 *)regs->eip - 43;
+ eip = (u8 __user *)regs->eip - 43;
for (i = 0; i < 64; i++, eip++) {
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.");
break;
}
- if (eip == (u8 *)regs->eip)
+ if (eip == (u8 __user *)regs->eip)
printk("<%02x> ", c);
else
printk("%02x ", c);
@@ -272,13 +272,13 @@ static void handle_BUG(struct pt_regs *r

if (eip < PAGE_OFFSET)
goto no_bug;
- if (__get_user(ud2, (unsigned short *)eip))
+ if (__get_user(ud2, (unsigned short __user *)eip))
goto no_bug;
if (ud2 != 0x0b0f)
goto no_bug;
- if (__get_user(line, (unsigned short *)(eip + 2)))
+ if (__get_user(line, (unsigned short __user *)(eip + 2)))
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))
file = "<bad filename>";

_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/