git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
x86_64
/
mm
/
fault.c
diff --git
a/arch/x86_64/mm/fault.c
b/arch/x86_64/mm/fault.c
index
2cdf34b
..
32a1d0c
100644
(file)
--- a/
arch/x86_64/mm/fault.c
+++ b/
arch/x86_64/mm/fault.c
@@
-389,7
+389,7
@@
bad_area_nosemaphore:
info.si_signo = SIGSEGV;
info.si_errno = 0;
/* info.si_code has been set above */
info.si_signo = SIGSEGV;
info.si_errno = 0;
/* info.si_code has been set above */
- info.si_addr = (void *)address;
+ info.si_addr = (void
__user
*)address;
force_sig_info(SIGSEGV, &info, tsk);
return;
}
force_sig_info(SIGSEGV, &info, tsk);
return;
}
@@
-463,7
+463,7
@@
do_sigbus:
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRERR;
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRERR;
- info.si_addr = (void *)address;
+ info.si_addr = (void
__user
*)address;
force_sig_info(SIGBUS, &info, tsk);
return;
force_sig_info(SIGBUS, &info, tsk);
return;