diff options
| author | James Morris <james.morris@microsoft.com> | 2018-12-13 02:44:29 +0300 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-13 02:44:29 +0300 |
| commit | d63962e38cc0a94cce4f39b8b171cdb55b69a4a5 (patch) | |
| tree | f672a0e80b3bf7c9f1ec76bdb6c9ef20a5d7a541 /include/linux | |
| parent | 1072bd678547f8663cfb81a22fdb50c589e4976e (diff) | |
| parent | fec7b6690541b8128663a13c9586b1daf42b0a6c (diff) | |
| download | linux-d63962e38cc0a94cce4f39b8b171cdb55b69a4a5.tar.xz | |
Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-seccomp
Add SECCOMP_RET_USER_NOTIF
From Kees.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/seccomp.h | 9 | ||||
| -rw-r--r-- | include/linux/syscalls.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index e5320f6c8654..84868d37b35d 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -4,9 +4,10 @@ #include <uapi/linux/seccomp.h> -#define SECCOMP_FILTER_FLAG_MASK (SECCOMP_FILTER_FLAG_TSYNC | \ - SECCOMP_FILTER_FLAG_LOG | \ - SECCOMP_FILTER_FLAG_SPEC_ALLOW) +#define SECCOMP_FILTER_FLAG_MASK (SECCOMP_FILTER_FLAG_TSYNC | \ + SECCOMP_FILTER_FLAG_LOG | \ + SECCOMP_FILTER_FLAG_SPEC_ALLOW | \ + SECCOMP_FILTER_FLAG_NEW_LISTENER) #ifdef CONFIG_SECCOMP @@ -43,7 +44,7 @@ extern void secure_computing_strict(int this_syscall); #endif extern long prctl_get_seccomp(void); -extern long prctl_set_seccomp(unsigned long, char __user *); +extern long prctl_set_seccomp(unsigned long, void __user *); static inline int seccomp_mode(struct seccomp *s) { diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 2ac3d13a915b..a60694fb0f58 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -879,7 +879,7 @@ asmlinkage long sys_renameat2(int olddfd, const char __user *oldname, int newdfd, const char __user *newname, unsigned int flags); asmlinkage long sys_seccomp(unsigned int op, unsigned int flags, - const char __user *uargs); + void __user *uargs); asmlinkage long sys_getrandom(char __user *buf, size_t count, unsigned int flags); asmlinkage long sys_memfd_create(const char __user *uname_ptr, unsigned int flags); |