diff options
| author | Linus Torvalds | 2021-06-28 19:49:37 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-06-28 19:49:37 -0700 |
| commit | 616ea5cc4a7b058f8c27e37b9a597d8704c49130 (patch) | |
| tree | 7a3a2186026a580de17847f2e574190740a62204 /include/uapi | |
| parent | 233a806b00e31b3ab8d57a68f1aab40cf1e5eaea (diff) | |
| parent | 9a03abc16c77062c73972df08206f1031862d9b4 (diff) | |
Merge tag 'seccomp-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp updates from Kees Cook:
- Add "atomic addfd + send reply" mode to SECCOMP_USER_NOTIF to better
handle EINTR races visible to seccomp monitors. (Rodrigo Campos,
Sargun Dhillon)
- Improve seccomp selftests for readability in CI systems. (Kees Cook)
* tag 'seccomp-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
selftests/seccomp: Avoid using "sysctl" for report
selftests/seccomp: Flush benchmark output
selftests/seccomp: More closely track fds being assigned
selftests/seccomp: Add test for atomic addfd+send
seccomp: Support atomic "addfd + send reply"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/seccomp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index 6ba18b82a02e..78074254ab98 100644 --- a/include/uapi/linux/seccomp.h +++ b/include/uapi/linux/seccomp.h @@ -115,6 +115,7 @@ struct seccomp_notif_resp { /* valid flags for seccomp_notif_addfd */ #define SECCOMP_ADDFD_FLAG_SETFD (1UL << 0) /* Specify remote fd */ +#define SECCOMP_ADDFD_FLAG_SEND (1UL << 1) /* Addfd and return it, atomically */ /** * struct seccomp_notif_addfd |