From a2ab38c9b8a8b99f998bb9b9743b3f5c9a4493b5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 26 Aug 2015 00:26:10 -0400 Subject: [PATCH] mips: siginfo.h: add SIGSYS details [BZ #18863] Linux 3.13 added SIGSYS details to siginfo_t; update glibc's copy to keep in sync with it. --- ChangeLog | 8 ++++++++ NEWS | 4 ++-- sysdeps/unix/sysv/linux/mips/bits/siginfo.h | 11 +++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d69000..1ddb153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-08-26 Mike Frysinger + + [BZ #18863] + * sysdeps/unix/sysv/linux/mips/bits/siginfo.h (siginfo_t): Add _sigsys. + (si_call_addr): Define. + (si_syscall): Define. + (si_arch): Define. + 2015-08-26 H.J. Lu * sysdeps/i386/i586/bzero.S (USE_AS_BZERO): New. diff --git a/NEWS b/NEWS index 80bddc8..5ef1a40 100644 --- a/NEWS +++ b/NEWS @@ -11,8 +11,8 @@ Version 2.23 14341, 16517, 16519, 16520, 16734, 16973, 17787, 17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18610, 18618, 18647, 18661, - 18674,18681, 18778, 18781, 18787, 18789, 18790, 18795, 18796, 18820, - 18823, 18824. + 18674, 18681, 18778, 18781, 18787, 18789, 18790, 18795, 18796, 18820, + 18823, 18824, 18863. * The obsolete header has been removed. Programs that require this header must be updated to use instead. diff --git a/sysdeps/unix/sysv/linux/mips/bits/siginfo.h b/sysdeps/unix/sysv/linux/mips/bits/siginfo.h index 3391319..96d406e 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/mips/bits/siginfo.h @@ -107,6 +107,14 @@ typedef struct long int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t; @@ -126,6 +134,9 @@ typedef struct # define si_addr_lsb _sifields._sigfault.si_addr_lsb # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch /* Values for `si_code'. Positive values are reserved for kernel-generated -- 2.7.4