Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031203AbbKEAvr (ORCPT ); Wed, 4 Nov 2015 19:51:47 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:33365 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965780AbbKEAvm (ORCPT ); Wed, 4 Nov 2015 19:51:42 -0500 From: "Amanieu d'Antras" To: linux-kernel@vger.kernel.org Cc: Oleg Nesterov , "Amanieu d'Antras" , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH v2 03/20] x86: Update compat_siginfo_t to be closer to the generic version Date: Thu, 5 Nov 2015 00:50:22 +0000 Message-Id: <1446684640-4112-4-git-send-email-amanieu@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1446684640-4112-1-git-send-email-amanieu@gmail.com> References: <1446684640-4112-1-git-send-email-amanieu@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3590 Lines: 115 x86 can't use the generic compat_siginfo_t because it needs to support x32, so we just change it to be closer to the generic version. The only significant change is the addition of several fields in _sigfault that were previously omitted. Signed-off-by: Amanieu d'Antras --- arch/x86/include/asm/compat.h | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h index c6b58b1..3643dac 100644 --- a/arch/x86/include/asm/compat.h +++ b/arch/x86/include/asm/compat.h @@ -130,6 +130,7 @@ typedef union compat_sigval { compat_uptr_t sival_ptr; } compat_sigval_t; +/* Need special handling for SIGCHLD on x32 */ #define HAVE_ARCH_COMPAT_SIGINFO_T #define HAVE_ARCH_COPY_SIGINFO_TO_USER32 #define HAVE_ARCH_COPY_SIGINFO_FROM_USER32 @@ -140,12 +141,12 @@ typedef struct compat_siginfo { int si_code; union { - int _pad[128/sizeof(int) - 3]; + int _pad[128 / sizeof(int) - 3]; /* kill() */ struct { - unsigned int _pid; /* sender's pid */ - unsigned int _uid; /* sender's uid */ + compat_pid_t _pid; /* sender's pid */ + __compat_uid32_t _uid; /* sender's uid */ } _kill; /* POSIX.1b timers */ @@ -153,21 +154,19 @@ typedef struct compat_siginfo { 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 */ - int _overrun_incr; /* amount to add to overrun */ } _timer; /* POSIX.1b signals */ struct { - unsigned int _pid; /* sender's pid */ - unsigned int _uid; /* sender's uid */ + compat_pid_t _pid; /* sender's pid */ + __compat_uid32_t _uid; /* sender's uid */ compat_sigval_t _sigval; } _rt; /* SIGCHLD */ struct { - unsigned int _pid; /* which child */ - unsigned int _uid; /* sender's uid */ + 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; @@ -175,7 +174,7 @@ typedef struct compat_siginfo { /* SIGCHLD (x32 version) */ struct { - unsigned int _pid; /* which child */ + compat_pid_t _pid; /* which child */ unsigned int _uid; /* sender's uid */ int _status; /* exit code */ compat_s64 _utime; @@ -184,19 +183,27 @@ typedef struct compat_siginfo { /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ struct { - unsigned int _addr; /* faulting insn/memory ref. */ + 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 { - int _band; /* POLL_IN, POLL_OUT, POLL_MSG */ + compat_long_t _band; /* POLL_IN, POLL_OUT, POLL_MSG */ int _fd; } _sigpoll; struct { - unsigned int _call_addr; /* calling insn */ + compat_uptr_t _call_addr; /* calling insn */ int _syscall; /* triggering system call number */ - unsigned int _arch; /* AUDIT_ARCH_* of syscall */ + compat_uint_t _arch; /* AUDIT_ARCH_* of syscall */ } _sigsys; } _sifields; } compat_siginfo_t; -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/