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

Commit b713da69 authored by Al Viro's avatar Al Viro Committed by Eric W. Biederman
Browse files

signal: unify compat_siginfo_t 



--EWB Added #ifdef CONFIG_X86_X32_ABI to arch/x86/kernel/signal_compat.c
      Changed #ifdef CONFIG_X86_X32 to #ifdef CONFIG_X86_X32_ABI in
      linux/compat.h

      CONFIG_X86_X32 is set when the user requests X32 support.

      CONFIG_X86_X32_ABI is set when the user requests X32 support
      and the tool-chain has X32 allowing X32 support to be built.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 4795477b

arch/arm64/include/asm/compat.h

+0 −63
Original line number Diff line number Diff line
@@ -150,69 +150,6 @@ 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 {

		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 */

		} _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;



		/* SIGSYS */

		struct {

			compat_uptr_t _call_addr; /* calling user insn */

			int _syscall;	/* triggering system call number */

			compat_uint_t _arch;	/* AUDIT_ARCH_* of syscall */

		} _sigsys;

	} _sifields;

} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff



/*

arch/mips/include/asm/compat.h

+0 −71
Original line number Diff line number Diff line
@@ -126,79 +126,8 @@ 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;



/* Can't use the generic version because si_code and si_errno are swapped */



#define SI_PAD_SIZE32	(128/sizeof(int) - 3)



typedef struct compat_siginfo {

	int si_signo;

	int si_code;

	int si_errno;



	union {

		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 */

		} _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. */

#ifdef __ARCH_SI_TRAPNO

			int _trapno;	/* TRAP # which caused the signal */

#endif

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

			struct {

				compat_uptr_t _lower;

				compat_uptr_t _upper;

			} _addr_bnd;

		} _sigfault;



		/* SIGPOLL */

		struct {

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

			int _fd;

		} _sigpoll;



		struct {

			compat_uptr_t _call_addr; /* calling insn */

			int _syscall;	/* triggering system call number */

			compat_uint_t _arch;	/* AUDIT_ARCH_* of syscall */

		} _sigsys;

	} _sifields;

} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff



/*

arch/parisc/include/asm/compat.h

+0 −63
Original line number Diff line number Diff line
@@ -130,69 +130,6 @@ 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 */

		} _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;



		/* SIGSYS */

		struct {

			compat_uptr_t _call_addr; /* calling user insn */

			int _syscall;	/* triggering system call number */

			compat_uint_t _arch;	/* AUDIT_ARCH_* of syscall */

		} _sigsys;

	} _sifields;

} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff



struct compat_ipc64_perm {

arch/powerpc/include/asm/compat.h

+0 −62
Original line number Diff line number Diff line
@@ -119,70 +119,8 @@ 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;



#define SI_PAD_SIZE32	(128/sizeof(int) - 3)



typedef struct compat_siginfo {

	int si_signo;

	int si_errno;

	int si_code;



	union {

		int _pad[SI_PAD_SIZE32];



		/* kill() */

		struct {

			compat_pid_t _pid;		/* sender's pid */

			__compat_uid_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 */

		} _timer;



		/* POSIX.1b signals */

		struct {

			compat_pid_t _pid;		/* sender's pid */

			__compat_uid_t _uid;		/* sender's uid */

			compat_sigval_t _sigval;

		} _rt;



		/* 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;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */

		struct {

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

		} _sigfault;



		/* SIGPOLL */

		struct {

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

			int _fd;

		} _sigpoll;



		/* SIGSYS */

		struct {

			unsigned int _call_addr; /* calling insn */

			int _syscall;		 /* triggering system call number */

			unsigned int _arch;	 /* AUDIT_ARCH_* of syscall */

		} _sigsys;

	} _sifields;

} compat_siginfo_t;



#define COMPAT_OFF_T_MAX	0x7fffffff



/*

arch/s390/include/asm/compat.h

+0 −72
Original line number Diff line number Diff line
@@ -189,78 +189,6 @@ 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 {

			pid_t	_pid;	/* sender's pid */

			uid_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 */

		} _timer;



		/* POSIX.1b signals */

		struct {

			pid_t			_pid;	/* sender's pid */

			uid_t			_uid;	/* sender's uid */

			compat_sigval_t		_sigval;

		} _rt;



		/* SIGCHLD */

		struct {

			pid_t			_pid;	/* which child */

			uid_t			_uid;	/* sender's uid */

			int			_status;/* exit code */

			compat_clock_t		_utime;

			compat_clock_t		_stime;

		} _sigchld;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

		struct {

			__u32	_addr;	/* faulting insn/memory ref. - pointer */

		} _sigfault;



		/* SIGPOLL */

		struct {

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

			int	_fd;

		} _sigpoll;

	} _sifields;

} compat_siginfo_t;



/*

 * How these fields are to be accessed.

 */

#define si_pid		_sifields._kill._pid

#define si_uid		_sifields._kill._uid

#define si_status	_sifields._sigchld._status

#define si_utime	_sifields._sigchld._utime

#define si_stime	_sifields._sigchld._stime

#define si_value	_sifields._rt._sigval

#define si_int		_sifields._rt._sigval.sival_int

#define si_ptr		_sifields._rt._sigval.sival_ptr

#define si_addr		_sifields._sigfault._addr

#define si_band		_sifields._sigpoll._band

#define si_fd		_sifields._sigpoll._fd

#define si_tid		_sifields._timer._tid

#define si_overrun	_sifields._timer._overrun



#define COMPAT_OFF_T_MAX	0x7fffffff



/*