summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-30 08:38:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-30 08:38:02 -0700
commitfea27bc7ff43a8beb6bebe6d4fe9eb889e185d4a (patch)
tree060f6deb9eb907bff65c8118fb2cba09f79c8da0 /security
parent83a50840e72a5a964b4704fcdc2fbb2d771015ab (diff)
parentdfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e (diff)
downloadlinux-fea27bc7ff43a8beb6bebe6d4fe9eb889e185d4a.tar.bz2
Merge tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull selinux fix from Paul Moore: "One small patch for the stable folks to fix a problem when building against the latest glibc. I'll be honest and say that I'm not really thrilled with the idea of sending this up right now, but Greg is a little annoyed so here I figured I would at least send this" * tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux: selinux: use kernel linux/socket.h for genheaders and mdp
Diffstat (limited to 'security')
-rw-r--r--security/selinux/include/classmap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
index bd5fe0d3204a..201f7e588a29 100644
--- a/security/selinux/include/classmap.h
+++ b/security/selinux/include/classmap.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
#include <linux/capability.h>
+#include <linux/socket.h>
#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
"getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"