summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-22 10:03:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-22 10:03:52 -0800
commit67327145c4af673d9c4ef06537ca8c5818f97668 (patch)
treec9c6365008efaaec6dd0fcf710c0c2de332878d8 /security
parenteb254f323bd50ab7e3cc385f2fc641a595cc8b37 (diff)
parentbfc5e3a6af397dcf9c99a6c1872458e7867c4680 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull SElinux fix from James Morris: "From Paul: 'A small SELinux patch to fix some clang/llvm compiler warnings and ensure the tools under scripts work well in the face of kernel changes'" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selinux: use the kernel headers when building scripts/selinux
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 e2d4ad3a4b4c..13ae49b0baa0 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"