summaryrefslogtreecommitdiff
path: root/include/uapi/linux/securebits.h
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-09-13 18:41:29 -0700
committerBrian Norris <computersforpeace@gmail.com>2015-09-13 18:41:29 -0700
commitdb66e32e0d2ae1f5070faa589aa460b75780ab47 (patch)
treefeafcfb8f6ae92fabcd4de7d83e839cc301530bc /include/uapi/linux/securebits.h
parentf9f3ce835ddce3c669eee869253105f88819888b (diff)
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
Merge tag 'v4.3-rc1' into MTD -next development
Diffstat (limited to 'include/uapi/linux/securebits.h')
-rw-r--r--include/uapi/linux/securebits.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/uapi/linux/securebits.h b/include/uapi/linux/securebits.h
index 985aac9e6bf8..35ac35cef217 100644
--- a/include/uapi/linux/securebits.h
+++ b/include/uapi/linux/securebits.h
@@ -43,9 +43,18 @@
#define SECBIT_KEEP_CAPS (issecure_mask(SECURE_KEEP_CAPS))
#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
+/* When set, a process cannot add new capabilities to its ambient set. */
+#define SECURE_NO_CAP_AMBIENT_RAISE 6
+#define SECURE_NO_CAP_AMBIENT_RAISE_LOCKED 7 /* make bit-6 immutable */
+
+#define SECBIT_NO_CAP_AMBIENT_RAISE (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE))
+#define SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED \
+ (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE_LOCKED))
+
#define SECURE_ALL_BITS (issecure_mask(SECURE_NOROOT) | \
issecure_mask(SECURE_NO_SETUID_FIXUP) | \
- issecure_mask(SECURE_KEEP_CAPS))
+ issecure_mask(SECURE_KEEP_CAPS) | \
+ issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE))
#define SECURE_ALL_LOCKS (SECURE_ALL_BITS << 1)
#endif /* _UAPI_LINUX_SECUREBITS_H */