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

Commit 751f409d authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Linus Torvalds
Browse files

compat: move compat_siginfo_t definition to asm/compat.h 



This is a preparatory patch for the introduction of NT_SIGINFO elf note.

Make the location of compat_siginfo_t uniform across eight architectures
which have it.  Now it can be pulled in by including asm/compat.h or
linux/compat.h.

Most of the copies are verbatim.  compat_uid[32]_t had to be replaced by
__compat_uid[32]_t.  compat_uptr_t had to be moved up before
compat_siginfo_t in asm/compat.h on a several architectures (tile already
had it moved up).  compat_sigval_t had to be relocated from linux/compat.h
to asm/compat.h.

Signed-off-by: default avatarDenys Vlasenko <vda.linux@googlemail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Amerigo Wang <amwang@redhat.com>
Cc: "Jonathan M. Foote" <jmfoote@cert.org>
Cc: Roland McGrath <roland@hack.frob.com>
Cc: Pedro Alves <palves@redhat.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ab1c309

arch/arm64/include/asm/compat.h

+59 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ typedef s64 compat_s64; 
typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_timespec {

	compat_time_t	tv_sec;
@@ -130,6 +131,64 @@ typedef u32 compat_old_sigset_t; 


typedef u32		compat_sigset_word;



typedef union compat_sigval {

	compat_int_t	sival_int;

	compat_uptr_t	sival_ptr;

} compat_sigval_t;



typedef struct compat_siginfo {

	int si_signo;

	int si_errno;

	int si_code;



	union {

		/* The padding is the same size as AArch64. */

		int _pad[128/sizeof(int) - 3];



		/* kill() */

		struct {

			compat_pid_t _pid;	/* sender's pid */

			__compat_uid32_t _uid;	/* sender's uid */

		} _kill;



		/* POSIX.1b timers */

		struct {

			compat_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_uid32_t _uid;	/* sender's uid */

			compat_sigval_t _sigval;

		} _rt;



		/* SIGCHLD */

		struct {

			compat_pid_t _pid;	/* which child */

			__compat_uid32_t _uid;	/* sender's uid */

			int _status;		/* exit code */

			compat_clock_t _utime;

			compat_clock_t _stime;

		} _sigchld;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

		struct {

			compat_uptr_t _addr; /* faulting insn/memory ref. */

			short _addr_lsb; /* LSB of the reported address */

		} _sigfault;



		/* SIGPOLL */

		struct {

			compat_long_t _band;	/* POLL_IN, POLL_OUT, POLL_MSG */

			int _fd;

		} _sigpoll;

	} _sifields;

} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
@@ -139,7 +198,6 @@ typedef u32 compat_sigset_word; 
 * as pointers because the syscall entry code will have

 * appropriately converted them already.

 */

typedef	u32		compat_uptr_t;



static inline void __user *compat_ptr(compat_uptr_t uptr)

{

arch/arm64/kernel/signal32.c

+0 −53
Original line number Diff line number Diff line
@@ -30,59 +30,6 @@ 
#include <asm/uaccess.h>

#include <asm/unistd.h>



typedef struct compat_siginfo {

	int si_signo;

	int si_errno;

	int si_code;



	union {

		/* The padding is the same size as AArch64. */

		int _pad[SI_PAD_SIZE];



		/* kill() */

		struct {

			compat_pid_t _pid;	/* sender's pid */

			__compat_uid32_t _uid;	/* sender's uid */

		} _kill;



		/* POSIX.1b timers */

		struct {

			compat_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_uid32_t _uid;	/* sender's uid */

			compat_sigval_t _sigval;

		} _rt;



		/* SIGCHLD */

		struct {

			compat_pid_t _pid;	/* which child */

			__compat_uid32_t _uid;	/* sender's uid */

			int _status;		/* exit code */

			compat_clock_t _utime;

			compat_clock_t _stime;

		} _sigchld;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

		struct {

			compat_uptr_t _addr; /* faulting insn/memory ref. */

			short _addr_lsb; /* LSB of the reported address */

		} _sigfault;



		/* SIGPOLL */

		struct {

			compat_long_t _band;	/* POLL_IN, POLL_OUT, POLL_MSG */

			int _fd;

		} _sigpoll;

	} _sifields;

} compat_siginfo_t;



struct compat_sigaction {

	compat_uptr_t			sa_handler;

	compat_ulong_t			sa_flags;

arch/mips/include/asm/compat-signal.h

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


#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)

{

arch/mips/include/asm/compat.h

+68 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ typedef s64 compat_s64; 
typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_timespec {

	compat_time_t	tv_sec;
@@ -124,6 +125,73 @@ typedef u32 compat_old_sigset_t; /* at least 32 bits */ 


typedef u32		compat_sigset_word;



typedef union compat_sigval {

	compat_int_t	sival_int;

	compat_uptr_t	sival_ptr;

} compat_sigval_t;



#define SI_PAD_SIZE32	(128/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;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
@@ -133,7 +201,6 @@ typedef u32 compat_sigset_word; 
 * as pointers because the syscall entry code will have

 * appropriately converted them already.

 */

typedef u32		compat_uptr_t;



static inline void __user *compat_ptr(compat_uptr_t uptr)

{

arch/parisc/include/asm/compat.h

+58 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ typedef s64 compat_s64; 
typedef u32	compat_uint_t;

typedef u32	compat_ulong_t;

typedef u64	compat_u64;

typedef u32	compat_uptr_t;



struct compat_timespec {

	compat_time_t		tv_sec;
@@ -127,6 +128,63 @@ typedef u32 compat_old_sigset_t; /* at least 32 bits */ 


typedef u32		compat_sigset_word;



typedef union compat_sigval {

	compat_int_t	sival_int;

	compat_uptr_t	sival_ptr;

} compat_sigval_t;



typedef struct compat_siginfo {

	int si_signo;

	int si_errno;

	int si_code;



	union {

		int _pad[128/sizeof(int) - 3];



		/* kill() */

		struct {

			unsigned int _pid;      /* sender's pid */

			unsigned int _uid;      /* sender's uid */

		} _kill;



		/* POSIX.1b timers */

		struct {

			compat_timer_t _tid;            /* timer id */

			int _overrun;           /* overrun count */

			char _pad[sizeof(unsigned int) - sizeof(int)];

			compat_sigval_t _sigval;        /* same as below */

			int _sys_private;       /* not to be passed to user */

		} _timer;



		/* POSIX.1b signals */

		struct {

			unsigned int _pid;      /* sender's pid */

			unsigned int _uid;      /* sender's uid */

			compat_sigval_t _sigval;

		} _rt;



		/* SIGCHLD */

		struct {

			unsigned int _pid;      /* which child */

			unsigned int _uid;      /* sender's uid */

			int _status;            /* exit code */

			compat_clock_t _utime;

			compat_clock_t _stime;

		} _sigchld;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

		struct {

			unsigned int _addr;     /* faulting insn/memory ref. */

		} _sigfault;



		/* SIGPOLL */

		struct {

			int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */

			int _fd;

		} _sigpoll;

	} _sifields;

} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff

#define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
@@ -136,7 +194,6 @@ typedef u32 compat_sigset_word; 
 * as pointers because the syscall entry code will have

 * appropriately converted them already.

 */

typedef	u32		compat_uptr_t;



static inline void __user *compat_ptr(compat_uptr_t uptr)

{