summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorPaul Moore <paul@paul-moore.com>2016-12-21 10:39:25 -0500
committerPaul Moore <paul@paul-moore.com>2016-12-21 10:39:25 -0500
commitbfc5e3a6af397dcf9c99a6c1872458e7867c4680 (patch)
tree09d7f23ed281538d97ead3b78691f2a33eee29ff /security
parent9287aed2ad1ff1bde5eb190bcd6dccd5f1cf47d3 (diff)
downloadop-kernel-dev-bfc5e3a6af397dcf9c99a6c1872458e7867c4680.zip
op-kernel-dev-bfc5e3a6af397dcf9c99a6c1872458e7867c4680.tar.gz
selinux: use the kernel headers when building scripts/selinux
Commit 3322d0d64f4e ("selinux: keep SELinux in sync with new capability definitions") added a check on the defined capabilities without explicitly including the capability header file which caused problems when building genheaders for users of clang/llvm. Resolve this by using the kernel headers when building genheaders, which is arguably the right thing to do regardless, and explicitly including the kernel's capability.h header file in classmap.h. We also update the mdp build, even though it wasn't causing an error we really should be using the headers from the kernel we are building. Reported-by: Nicolas Iooss <nicolas.iooss@m4x.org> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/include/classmap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
index e2d4ad3..13ae49b 100644
--- a/security/selinux/include/classmap.h
+++ b/security/selinux/include/classmap.h
@@ -1,3 +1,5 @@
+#include <linux/capability.h>
+
#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
"getattr", "setattr", "lock", "relabelfrom", "relabelto", "append"
OpenPOWER on IntegriCloud