diff options
| author | James Morris <jmorris@namei.org> | 2018-02-22 19:50:24 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2018-02-22 19:50:24 +0100 |
| commit | 645ae5c51e85d7dbb25177866d5016a89d5243ad (patch) | |
| tree | a4d638616c5db0bde980c6bf5b494f70b6bbef0c /include | |
| parent | Merge tag 'leds_for-4.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | seccomp: add a selftest for get_metadata (diff) | |
| download | linux-645ae5c51e85d7dbb25177866d5016a89d5243ad.tar.xz linux-645ae5c51e85d7dbb25177866d5016a89d5243ad.zip | |
Merge tag 'seccomp-v4.16-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into fixes-v4.16-rc3
- Fix seccomp GET_METADATA to deal with field sizes correctly (Tycho Andersen)
- Add selftest to make sure GET_METADATA doesn't regress (Tycho Andersen)
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/ptrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h index e46d82b91166..d5a1b8a492b9 100644 --- a/include/uapi/linux/ptrace.h +++ b/include/uapi/linux/ptrace.h @@ -69,8 +69,8 @@ struct ptrace_peeksiginfo_args { #define PTRACE_SECCOMP_GET_METADATA 0x420d struct seccomp_metadata { - unsigned long filter_off; /* Input: which filter */ - unsigned int flags; /* Output: filter's flags */ + __u64 filter_off; /* Input: which filter */ + __u64 flags; /* Output: filter's flags */ }; /* Read signals from a shared (process wide) queue */ |