Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a76f3a41 authored by Pavel Kiryukhin's avatar Pavel Kiryukhin Committed by Ralf Baechle
Browse files

[MIPS] use compat_siginfo in rt_sigframe_n32 



Signed-off-by: default avatarPavel Kiryukhin <vksavl@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c8eae71d

arch/mips/kernel/signal32.c

+0 −62
Original line number Diff line number Diff line
@@ -36,68 +36,6 @@ 


#include "signal-common.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;



/*

 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...

 */

arch/mips/kernel/signal_n32.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

include/asm-mips/compat-signal.h

+62 −0
Original line number Diff line number Diff line
@@ -10,6 +10,68 @@ 


#include <asm/uaccess.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;



static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d,

	const sigset_t *s)

{