use compat_siginfo in rt_sigframe_n32
There was an old patch
<http://www.linux-mips.org/archives/linux-mips/2006-07/msg00216.html>
that suggested (also) to use compat_siginfo in rt_sigframe_n32. It seems that it is still an issue.
Signature · 2 lines
Regards, Pavel mailto:[email protected]
From: Pavel Kiryukhin <[email protected]>
Date: Tue, 5 Jun 2007 11:51:19 +0400
Subject: [PATCH] Use compat_siginfo and copy_siginfo_to_user32 in setup_rt_frame_n32().
Signed-off-by Pavel Kiryukhin <[email protected]>
arch/mips/kernel/signal-common.h +64 -0
@@ -43,4 +43,68 @@ extern int fpcsr_pending(unsigned int __user *fpcsr);#define unlock_fpu_owner () pagefault_enable()#endif +#include <linux/compat.h> + +#define SI_PAD_SIZE32 ((SI_MAX_SIZE/sizeof(int)) - 3) + +typedef struct compat_siginfo { +int si_signo; +int si_code; +int si_errno; + +union { +int _pad[SI_PAD_SIZE32 ]; + +/* kill() */ +struct { +compat_pid_t _pid;/* sender's pid */ +compat_uid_t _uid;/* sender's uid */ + } _kill; + +/* SIGCHLD */ +struct { +compat_pid_t _pid;/* which child */ +compat_uid_t _uid;/* sender's uid */ +int _status;/* exit code */ +compat_clock_t _utime; +compat_clock_t _stime; + } _sigchld; + +/* IRIX SIGCHLD */ +struct { +compat_pid_t _pid;/* which child */ +compat_clock_t _utime; +int _status;/* exit code */ +compat_clock_t _stime; + } _irix_sigchld; + +/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ +struct { +s32 _addr;/* faulting insn/memory ref. */ + } _sigfault; + +/* SIGPOLL, SIGXFSZ (To do ...) */ +struct { +int _band;/* POLL_IN, POLL_OUT, POLL_MSG */ +int _fd; + } _sigpoll; + +/* POSIX.1b timers */ +struct { +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +compat_sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ + } _timer; + +/* POSIX.1b signals */ +struct { +compat_pid_t _pid;/* sender's pid */ +compat_uid_t _uid;/* sender's uid */ +compat_sigval_t _sigval; + } _rt; + + } _sifields; +}compat_siginfo_t ; +#endif /* __SIGNAL_COMMON_H */
arch/mips/kernel/signal32.c +0 -62
68 lines not on this page · raw message
arch/mips/kernel/signal_n32.c +3 -3
@@ -72,7 +72,7 @@ struct ucontextn32 {struct rt_sigframe_n32 {u32 rs_ass[4 ];/* argument save space for o32 */ u32 rs_code[2 ];/* signal trampoline */ -struct siginfo rs_info; +struct compat_siginfo rs_info;struct ucontextn32 rs_uc; };
@@ -81,7 +81,7 @@ struct rt_sigframe_n32 {struct rt_sigframe_n32 {u32 rs_ass[4 ];/* argument save space for o32 */ u32 rs_pad[2 ]; -struct siginfo rs_info; +struct compat_siginfo rs_info;struct ucontextn32 rs_uc;u32 rs_code[8 ]____cacheline_aligned ;/* signal trampoline */ };
@@ -187,7 +187,7 @@ static int setup_rt_frame_n32(struct k_sigaction * ka,install_sigtramp (frame->rs_code, __NR_N32_rt_sigreturn);/* Create siginfo. */ - err |=copy_siginfo_to_user (&frame->rs_info, info); + err |=copy_siginfo_to_user32 (&frame->rs_info, info);/* Create the ucontext. */ err |=__put_user (0 , &frame->rs_uc.uc_flags);
Signature · 1 line
1.5.2.1