]> git.karo-electronics.de Git - linux-beck.git/commitdiff
selinux: keep SELinux in sync with new capability definitions
authorStephen Smalley <sds@tycho.nsa.gov>
Fri, 18 Nov 2016 15:23:09 +0000 (10:23 -0500)
committerPaul Moore <paul@paul-moore.com>
Mon, 21 Nov 2016 20:37:24 +0000 (15:37 -0500)
When a new capability is defined, SELinux needs to be updated.
Trigger a build error if a new capability is defined without
corresponding update to security/selinux/include/classmap.h's
COMMON_CAP2_PERMS.  This is similar to BUILD_BUG_ON() guards
in the SELinux nlmsgtab code to ensure that SELinux tracks
new netlink message types as needed.

Note that there is already a similar build guard in
security/selinux/hooks.c to detect when more than 64
capabilities are defined, since that will require adding
a third capability class to SELinux.

A nicer way to do this would be to extend scripts/selinux/genheaders
or a similar tool to auto-generate the necessary definitions and code
for SELinux capability checking from include/uapi/linux/capability.h.
AppArmor does something similar in its Makefile, although it only
needs to generate a single table of names.  That is left as future
work.

Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
[PM: reformat the description to keep checkpatch.pl happy]
Signed-off-by: Paul Moore <paul@paul-moore.com>
security/selinux/include/classmap.h

index 1f1f4b2f6018de5f3599d02aff1811c4f3aa85ed..e2d4ad3a4b4c5e01a063747a4286e1b51c05f697 100644 (file)
 #define COMMON_CAP2_PERMS  "mac_override", "mac_admin", "syslog", \
                "wake_alarm", "block_suspend", "audit_read"
 
+#if CAP_LAST_CAP > CAP_AUDIT_READ
+#error New capability defined, please update COMMON_CAP2_PERMS.
+#endif
+
 /*
  * Note: The name for any socket class should be suffixed by "socket",
  *      and doesn't contain more than one substr of "socket".