summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-02 17:36:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-02 17:36:24 -0700
commitd9afbb3509900a953f5cf90bc57e793ee80c1108 (patch)
treef882d48ad8e0b728f8eeb5502b71e4540c2dc92f /include/uapi
parentf41030a20b38552a2da3b3f6bc9e7a78637d6c23 (diff)
parent56f2e3b7d819f4fa44857ba81aa6870f18714ea0 (diff)
downloadlinux-d9afbb3509900a953f5cf90bc57e793ee80c1108.tar.bz2
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull lockdown update from James Morris: "An update for the security subsystem to allow unprivileged users to see the status of the lockdown feature. From Jeremy Cline" Also an added comment to describe CAP_SETFCAP. * 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: capabilities: add description for CAP_SETFCAP lockdown: Allow unprivileged users to see lockdown status
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/capability.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h
index e58c9636741b..c4532b0fe00f 100644
--- a/include/uapi/linux/capability.h
+++ b/include/uapi/linux/capability.h
@@ -332,6 +332,8 @@ struct vfs_ns_cap_data {
#define CAP_AUDIT_CONTROL 30
+/* Set or remove capabilities on files */
+
#define CAP_SETFCAP 31
/* Override MAC access.