mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 11:43:34 +08:00
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:
parent
c550fff3b7
commit
a06d48fb9f
23
ChangeLog
23
ChangeLog
@ -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>
|
||||
|
||||
[BZ #23037]
|
||||
|
@ -132,8 +132,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -192,8 +192,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -66,6 +66,13 @@ enum __ptrace_peeksiginfo_flags
|
||||
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
|
||||
above, and determines the action to be taken.
|
||||
For all requests except PTRACE_TRACEME, PID specifies the process to be
|
||||
|
@ -145,8 +145,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -49,6 +49,7 @@ __BEGIN_DECLS
|
||||
# undef PTRACE_POKEDATA
|
||||
# undef PTRACE_POKETEXT
|
||||
# undef PTRACE_SECCOMP_GET_FILTER
|
||||
# undef PTRACE_SECCOMP_GET_METADATA
|
||||
# undef PTRACE_SEIZE
|
||||
# undef PTRACE_SET_DEBUGREG
|
||||
# undef PTRACE_SETEVRREGS
|
||||
@ -236,8 +237,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -52,6 +52,7 @@ __BEGIN_DECLS
|
||||
# undef PTRACE_GETSIGMASK
|
||||
# undef PTRACE_SETSIGMASK
|
||||
# undef PTRACE_SECCOMP_GET_FILTER
|
||||
# undef PTRACE_SECCOMP_GET_METADATA
|
||||
# undef PTRACE_PEEKUSR_AREA
|
||||
# undef PTRACE_POKEUSR_AREA
|
||||
# undef PTRACE_GET_LAST_BREAK
|
||||
@ -193,6 +194,10 @@ enum __ptrace_request
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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,
|
||||
#define PTRACE_PEEKUSR_AREA PTRACE_PEEKUSR_AREA
|
||||
|
||||
|
@ -213,8 +213,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -162,8 +162,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -136,8 +136,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
@ -182,8 +182,12 @@ enum __ptrace_request
|
||||
#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
|
||||
|
||||
/* Get seccomp BPF filters. */
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c
|
||||
PTRACE_SECCOMP_GET_FILTER = 0x420c,
|
||||
#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
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user