From a61a1a2576e82c7a0c5de620b2eda755edeffb88 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 23 Nov 2015 17:53:08 +0000 Subject: [PATCH] Update for Linux 4.3. This patch updates for Linux 4.3, adding PTRACE_O_SUSPEND_SECCOMP and updating the value of PTRACE_O_MASK. Some architectures were missing the older PTRACE_O_EXITKILL, so that was added to the files missing it as well. Tested for x86_64 (testsuite, and that installed shared libraries are unchanged by the patch). * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (PTRACE_O_EXITKILL): New value in enum __ptrace_setoptions. (PTRACE_O_SUSPEND_SECCOMP): Likewise. (PTRACE_O_MASK): Update value. * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (PTRACE_O_EXITKILL): New value in enum __ptrace_setoptions. (PTRACE_O_SUSPEND_SECCOMP): Likewise. (PTRACE_O_MASK): Update value. * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. (PTRACE_O_MASK): Update value. * sysdeps/unix/sysv/linux/s390/sys/ptrace.h (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. (PTRACE_O_MASK): Update value. * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. (PTRACE_O_MASK): Update value. * sysdeps/unix/sysv/linux/sys/ptrace.h (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. (PTRACE_O_MASK): Update value. * sysdeps/unix/sysv/linux/tile/sys/ptrace.h (PTRACE_O_EXITKILL): New value in enum __ptrace_setoptions. (PTRACE_O_SUSPEND_SECCOMP): Likewise. (PTRACE_O_MASK): Update value. --- ChangeLog | 25 ++++++++++++++++++++ sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 4 +++- sysdeps/unix/sysv/linux/ia64/sys/ptrace.h | 4 +++- sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h | 3 ++- sysdeps/unix/sysv/linux/s390/sys/ptrace.h | 3 ++- sysdeps/unix/sysv/linux/sparc/sys/ptrace.h | 3 ++- sysdeps/unix/sysv/linux/sys/ptrace.h | 3 ++- sysdeps/unix/sysv/linux/tile/sys/ptrace.h | 4 +++- 8 files changed, 42 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d68226eb2c..e682445249 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,30 @@ 2015-11-23 Joseph Myers + * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h + (PTRACE_O_EXITKILL): New value in enum __ptrace_setoptions. + (PTRACE_O_SUSPEND_SECCOMP): Likewise. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (PTRACE_O_EXITKILL): + New value in enum __ptrace_setoptions. + (PTRACE_O_SUSPEND_SECCOMP): Likewise. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h + (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/s390/sys/ptrace.h + (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h + (PTRACE_O_SUSPEND_SECCOMP): New value in enum __ptrace_setoptions. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/sys/ptrace.h (PTRACE_O_SUSPEND_SECCOMP): + New value in enum __ptrace_setoptions. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/tile/sys/ptrace.h (PTRACE_O_EXITKILL): + New value in enum __ptrace_setoptions. + (PTRACE_O_SUSPEND_SECCOMP): Likewise. + (PTRACE_O_MASK): Update value. + * sysdeps/unix/sysv/linux/netpacket/packet.h (PACKET_COPY_THRESH): New macro. (PACKET_AUXDATA): Likewise. diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h index 4ef5fa43bc..fd987eca5c 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h @@ -149,7 +149,9 @@ enum __ptrace_setoptions PTRACE_O_TRACEVFORKDONE = 0x00000020, PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, - PTRACE_O_MASK = 0x000000ff + PTRACE_O_EXITKILL = 0x00100000, + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */ diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h index 6f00f5524e..0d22725a2a 100644 --- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h @@ -169,7 +169,9 @@ enum __ptrace_setoptions PTRACE_O_TRACEVFORKDONE = 0x00000020, PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, - PTRACE_O_MASK = 0x000000ff + PTRACE_O_EXITKILL = 0x00100000, + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h index 4b768baab8..20a73656c6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h @@ -142,7 +142,8 @@ enum __ptrace_setoptions PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, PTRACE_O_EXITKILL = 0x00100000, - PTRACE_O_MASK = 0x001000ff + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */ diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h index a43fcaaf0e..ebebde2fe7 100644 --- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h @@ -181,7 +181,8 @@ enum __ptrace_setoptions PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, PTRACE_O_EXITKILL = 0x00100000, - PTRACE_O_MASK = 0x001000ff + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h index b54b75d917..ad3c2c6a82 100644 --- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h @@ -224,7 +224,8 @@ enum __ptrace_setoptions PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, PTRACE_O_EXITKILL = 0x00100000, - PTRACE_O_MASK = 0x001000ff + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */ diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h index 621daf76ee..dc956bb458 100644 --- a/sysdeps/unix/sysv/linux/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/sys/ptrace.h @@ -172,7 +172,8 @@ enum __ptrace_setoptions PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, PTRACE_O_EXITKILL = 0x00100000, - PTRACE_O_MASK = 0x001000ff + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */ diff --git a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h index 9ad40d61c4..adee5e99f2 100644 --- a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h @@ -138,7 +138,9 @@ enum __ptrace_setoptions PTRACE_O_TRACEVFORKDONE = 0x00000020, PTRACE_O_TRACEEXIT = 0x00000040, PTRACE_O_TRACESECCOMP = 0x00000080, - PTRACE_O_MASK = 0x000000ff + PTRACE_O_EXITKILL = 0x00100000, + PTRACE_O_SUSPEND_SECCOMP = 0x00200000, + PTRACE_O_MASK = 0x003000ff }; /* Wait extended result codes for the above trace options. */