History

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

Linus Torvalds committed 6 years ago

Commit d9afbb32 parents f41030a 56f2e3b2 files · +3 −1Browse files

Showing the changes to include/uapi (1 of 2 files). Show all

Unified · Split

include/uapi/linux/capability.h+2−0
@@ -332,6 +332,8 @@ struct vfs_ns_cap_data { · 331 unmodified lines
332332
333333 #define CAP_AUDIT_CONTROL 30
334334
335+/* Set or remove capabilities on files */
336+
335337 #define CAP_SETFCAP 31
336338
337339 /* Override MAC access.