diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 13:44:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 13:44:45 -0800 |
| commit | 3dbc4f548519f9882676843b4fcdb4e61668baf8 (patch) | |
| tree | c2d1dd097034bbfff7519f08836e3dd4ad7ac309 /kernel/ptrace.c | |
| parent | ae0cb7be35fe6c7e8bcc816ec4185d0a37748cc1 (diff) | |
| parent | 26025bf58b9fe3806ce4f92600e96a2c214c0d9c (diff) | |
| download | linux-3dbc4f548519f9882676843b4fcdb4e61668baf8.tar.gz linux-3dbc4f548519f9882676843b4fcdb4e61668baf8.tar.bz2 linux-3dbc4f548519f9882676843b4fcdb4e61668baf8.zip | |
Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull seccomp updates from James Morris:
"Add support for retrieving seccomp metadata"
* 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ptrace, seccomp: add support for retrieving seccomp metadata
seccomp: hoist out filter resolving logic
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index f3c82e26b995..5e1d713c8e61 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -1092,6 +1092,10 @@ int ptrace_request(struct task_struct *child, long request, ret = seccomp_get_filter(child, addr, datavp); break; + case PTRACE_SECCOMP_GET_METADATA: + ret = seccomp_get_metadata(child, addr, datavp); + break; + default: break; } |