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
/
sparc64
/
kernel
/
sys_sunos32.c
diff --git
a/arch/sparc64/kernel/sys_sunos32.c
b/arch/sparc64/kernel/sys_sunos32.c
index
0ed11ea
..
ace96ee
100644
(file)
--- a/
arch/sparc64/kernel/sys_sunos32.c
+++ b/
arch/sparc64/kernel/sys_sunos32.c
@@
-465,7
+465,7
@@
asmlinkage int sunos_nosys(void)
info.si_signo = SIGSYS;
info.si_errno = 0;
info.si_code = __SI_FAULT|0x100;
info.si_signo = SIGSYS;
info.si_errno = 0;
info.si_code = __SI_FAULT|0x100;
- info.si_addr = (void *)regs->tpc;
+ info.si_addr = (void
__user
*)regs->tpc;
info.si_trapno = regs->u_regs[UREG_G1];
send_sig_info(SIGSYS, &info, current);
if (cnt++ < 4) {
info.si_trapno = regs->u_regs[UREG_G1];
send_sig_info(SIGSYS, &info, current);
if (cnt++ < 4) {
@@
-1280,7
+1280,7
@@
asmlinkage int sunos_sigaction (int sig,
if (get_user(u_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_flags, &act->sa_flags))
return -EFAULT;
if (get_user(u_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_flags, &act->sa_flags))
return -EFAULT;
- new_ka.sa.sa_handler =
(void *) (long) u_handler
;
+ new_ka.sa.sa_handler =
compat_ptr(u_handler)
;
__get_user(mask, &act->sa_mask);
new_ka.sa.sa_restorer = NULL;
new_ka.ka_restorer = NULL;
__get_user(mask, &act->sa_mask);
new_ka.sa.sa_restorer = NULL;
new_ka.ka_restorer = NULL;