qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add PTRACE_SECCOMP_GET_METADATA from Linux 4.16 to sys/ptrace.h. 

This patch adds the PTRACE_SECCOMP_GET_METADATA constant from Linux
4.16 to all relevant sys/ptrace.h files.  A type struct
__ptrace_seccomp_metadata, analogous to other such types, is also
added.

Tested for x86_64, and with build-many-glibcs.py.

	* sysdeps/unix/sysv/linux/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): New enum value and macro.
	* sysdeps/unix/sysv/linux/bits/ptrace-shared.h
	(struct __ptrace_seccomp_metadata): New type.
	* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/arm/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/s390/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/tile/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.
	* sysdeps/unix/sysv/linux/x86/sys/ptrace.h
	(PTRACE_SECCOMP_GET_METADATA): Likewise.

(cherry picked from commit 9320ca88a1)
This commit is contained in:
Joseph Myers 2018-04-24 12:11:35 +00:00 committed by Dmitry V. Levin
parent c550fff3b7
commit a06d48fb9f
11 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2018-04-24 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): New enum value and macro.
* sysdeps/unix/sysv/linux/bits/ptrace-shared.h
(struct __ptrace_seccomp_metadata): New type.
* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/arm/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/tile/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
* sysdeps/unix/sysv/linux/x86/sys/ptrace.h
(PTRACE_SECCOMP_GET_METADATA): Likewise.
2018-04-09 Florian Weimer <fweimer@redhat.com> 2018-04-09 Florian Weimer <fweimer@redhat.com>
[BZ #23037] [BZ #23037]

6
sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
View File

@ -132,8 +132,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

6
sysdeps/unix/sysv/linux/arm/sys/ptrace.h
View File

@ -192,8 +192,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

7
sysdeps/unix/sysv/linux/bits/ptrace-shared.h
View File

@ -66,6 +66,13 @@ enum __ptrace_peeksiginfo_flags
PTRACE_PEEKSIGINFO_SHARED = (1 << 0) PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
}; };
/* Argument and results of PTRACE_SECCOMP_GET_METADATA. */
struct __ptrace_seccomp_metadata
{
__uint64_t filter_off; /* Input: which filter. */
__uint64_t flags; /* Output: filter's flags. */
};
/* Perform process tracing functions. REQUEST is one of the values /* Perform process tracing functions. REQUEST is one of the values
above, and determines the action to be taken. above, and determines the action to be taken.
For all requests except PTRACE_TRACEME, PID specifies the process to be For all requests except PTRACE_TRACEME, PID specifies the process to be

6
sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
View File

@ -145,8 +145,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

7
sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
View File

@ -49,6 +49,7 @@ __BEGIN_DECLS
# undef PTRACE_POKEDATA # undef PTRACE_POKEDATA
# undef PTRACE_POKETEXT # undef PTRACE_POKETEXT
# undef PTRACE_SECCOMP_GET_FILTER # undef PTRACE_SECCOMP_GET_FILTER
# undef PTRACE_SECCOMP_GET_METADATA
# undef PTRACE_SEIZE # undef PTRACE_SEIZE
# undef PTRACE_SET_DEBUGREG # undef PTRACE_SET_DEBUGREG
# undef PTRACE_SETEVRREGS # undef PTRACE_SETEVRREGS
@ -236,8 +237,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

5
sysdeps/unix/sysv/linux/s390/sys/ptrace.h
View File

@ -52,6 +52,7 @@ __BEGIN_DECLS
# undef PTRACE_GETSIGMASK # undef PTRACE_GETSIGMASK
# undef PTRACE_SETSIGMASK # undef PTRACE_SETSIGMASK
# undef PTRACE_SECCOMP_GET_FILTER # undef PTRACE_SECCOMP_GET_FILTER
# undef PTRACE_SECCOMP_GET_METADATA
# undef PTRACE_PEEKUSR_AREA # undef PTRACE_PEEKUSR_AREA
# undef PTRACE_POKEUSR_AREA # undef PTRACE_POKEUSR_AREA
# undef PTRACE_GET_LAST_BREAK # undef PTRACE_GET_LAST_BREAK
@ -193,6 +194,10 @@ enum __ptrace_request
PTRACE_SECCOMP_GET_FILTER = 0x420c, PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d,
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
PTRACE_PEEKUSR_AREA = 0x5000, PTRACE_PEEKUSR_AREA = 0x5000,
#define PTRACE_PEEKUSR_AREA PTRACE_PEEKUSR_AREA #define PTRACE_PEEKUSR_AREA PTRACE_PEEKUSR_AREA

6
sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
View File

@ -213,8 +213,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

6
sysdeps/unix/sysv/linux/sys/ptrace.h
View File

@ -162,8 +162,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

6
sysdeps/unix/sysv/linux/tile/sys/ptrace.h
View File

@ -136,8 +136,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };

6
sysdeps/unix/sysv/linux/x86/sys/ptrace.h
View File

@ -182,8 +182,12 @@ enum __ptrace_request
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
/* Get seccomp BPF filters. */ /* Get seccomp BPF filters. */
PTRACE_SECCOMP_GET_FILTER = 0x420c PTRACE_SECCOMP_GET_FILTER = 0x420c,
#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
/* Get seccomp BPF filter metadata. */
PTRACE_SECCOMP_GET_METADATA = 0x420d
#define PTRACE_SECCOMP_GET_METADATA PTRACE_SECCOMP_GET_METADATA
}; };