Pull seccomp updates from James Morris: - Add SECCOMP_RET_USER_NOTIF - seccomp fixes for sparse warnings and s390 build (Tycho) * 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: seccomp, s390: fix build for syscall type change seccomp: fix poor type promotion samples: add an example of seccomp user trap seccomp: add a return code to trap to userspace seccomp: switch system call argument type to void * seccomp: hoist struct seccomp_data recalculation higher
Showing the changes to include/uapi/linux (1 of 11 files). Show all
Unified · Split
| @@ -15,11 +15,13 @@ · 14 unmodified lines | |||
| 15 | #define SECCOMP_SET_MODE_STRICT 0 | 15 | #define SECCOMP_SET_MODE_STRICT 0 |
| 16 | #define SECCOMP_SET_MODE_FILTER 1 | 16 | #define SECCOMP_SET_MODE_FILTER 1 |
| 17 | #define SECCOMP_GET_ACTION_AVAIL 2 | 17 | #define SECCOMP_GET_ACTION_AVAIL 2 |
| 18 | #define SECCOMP_GET_NOTIF_SIZES 3 | ||
| 18 | 19 | ||
| 19 | /* Valid flags for SECCOMP_SET_MODE_FILTER */ | 20 | /* Valid flags for SECCOMP_SET_MODE_FILTER */ |
| 20 | #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) | 21 | #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) |
| 21 | #define SECCOMP_FILTER_FLAG_LOG (1UL << 1) | 22 | #define SECCOMP_FILTER_FLAG_LOG (1UL << 1) |
| 22 | #define SECCOMP_FILTER_FLAG_SPEC_ALLOW (1UL << 2) | 23 | #define SECCOMP_FILTER_FLAG_SPEC_ALLOW (1UL << 2) |
| 24 | #define SECCOMP_FILTER_FLAG_NEW_LISTENER (1UL << 3) | ||
| 23 | 25 | ||
| 24 | /* | 26 | /* |
| 25 | * All BPF programs must return a 32-bit value. | 27 | * All BPF programs must return a 32-bit value. |
| @@ -35,6 +37,7 @@ · 9 unmodified lines | |||
| 35 | #define SECCOMP_RET_KILL SECCOMP_RET_KILL_THREAD | 37 | #define SECCOMP_RET_KILL SECCOMP_RET_KILL_THREAD |
| 36 | #define SECCOMP_RET_TRAP 0x00030000U /* disallow and force a SIGSYS */ | 38 | #define SECCOMP_RET_TRAP 0x00030000U /* disallow and force a SIGSYS */ |
| 37 | #define SECCOMP_RET_ERRNO 0x00050000U /* returns an errno */ | 39 | #define SECCOMP_RET_ERRNO 0x00050000U /* returns an errno */ |
| 40 | #define SECCOMP_RET_USER_NOTIF 0x7fc00000U /* notifies userspace */ | ||
| 38 | #define SECCOMP_RET_TRACE 0x7ff00000U /* pass to a tracer or disallow */ | 41 | #define SECCOMP_RET_TRACE 0x7ff00000U /* pass to a tracer or disallow */ |
| 39 | #define SECCOMP_RET_LOG 0x7ffc0000U /* allow after logging */ | 42 | #define SECCOMP_RET_LOG 0x7ffc0000U /* allow after logging */ |
| 40 | #define SECCOMP_RET_ALLOW 0x7fff0000U /* allow */ | 43 | #define SECCOMP_RET_ALLOW 0x7fff0000U /* allow */ |
| @@ -60,4 +63,35 @@ struct seccomp_data { · 19 unmodified lines | |||
| 60 | __u64 args[6]; | 63 | __u64 args[6]; |
| 61 | }; | 64 | }; |
| 62 | 65 | ||
| 66 | struct seccomp_notif_sizes { | ||
| 67 | __u16 seccomp_notif; | ||
| 68 | __u16 seccomp_notif_resp; | ||
| 69 | __u16 seccomp_data; | ||
| 70 | }; | ||
| 71 | |||
| 72 | struct seccomp_notif { | ||
| 73 | __u64 id; | ||
| 74 | __u32 pid; | ||
| 75 | __u32 flags; | ||
| 76 | struct seccomp_data data; | ||
| 77 | }; | ||
| 78 | |||
| 79 | struct seccomp_notif_resp { | ||
| 80 | __u64 id; | ||
| 81 | __s64 val; | ||
| 82 | __s32 error; | ||
| 83 | __u32 flags; | ||
| 84 | }; | ||
| 85 | |||
| 86 | #define SECCOMP_IOC_MAGIC '!' | ||
| 87 | #define SECCOMP_IO(nr) _IO(SECCOMP_IOC_MAGIC, nr) | ||
| 88 | #define SECCOMP_IOR(nr, type) _IOR(SECCOMP_IOC_MAGIC, nr, type) | ||
| 89 | #define SECCOMP_IOW(nr, type) _IOW(SECCOMP_IOC_MAGIC, nr, type) | ||
| 90 | #define SECCOMP_IOWR(nr, type) _IOWR(SECCOMP_IOC_MAGIC, nr, type) | ||
| 91 | |||
| 92 | /* Flags for seccomp notification fd ioctl. */ | ||
| 93 | #define SECCOMP_IOCTL_NOTIF_RECV SECCOMP_IOWR(0, struct seccomp_notif) | ||
| 94 | #define SECCOMP_IOCTL_NOTIF_SEND SECCOMP_IOWR(1, \ | ||
| 95 | struct seccomp_notif_resp) | ||
| 96 | #define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64) | ||
| 63 | #endif /* _UAPI_LINUX_SECCOMP_H */ | 97 | #endif /* _UAPI_LINUX_SECCOMP_H */ |