summaryrefslogtreecommitdiff
path: root/scripts/selinux
diff options
context:
space:
mode:
authorPaulo Alcantara <paulo@paulo.ac>2019-02-24 21:55:28 -0300
committerPaul Moore <paul@paul-moore.com>2019-03-18 18:52:10 -0400
commitff1bf4c0714e7936330bb316090a75eaa35061e7 (patch)
tree1496c36cb9c09e23d151ceff2044a252f2d5c52c /scripts/selinux
parente37c1877ba5b17d4251e1688449f8d43fc090802 (diff)
downloadlinux-rpi-ff1bf4c0714e7936330bb316090a75eaa35061e7.tar.gz
linux-rpi-ff1bf4c0714e7936330bb316090a75eaa35061e7.tar.bz2
linux-rpi-ff1bf4c0714e7936330bb316090a75eaa35061e7.zip
selinux: use kernel linux/socket.h for genheaders and mdp
When compiling genheaders and mdp from a newer host kernel, the following error happens: In file included from scripts/selinux/genheaders/genheaders.c:18: ./security/selinux/include/classmap.h:238:2: error: #error New address family defined, please update secclass_map. #error New address family defined, please update secclass_map. ^~~~~ make[3]: *** [scripts/Makefile.host:107: scripts/selinux/genheaders/genheaders] Error 1 make[2]: *** [scripts/Makefile.build:599: scripts/selinux/genheaders] Error 2 make[1]: *** [scripts/Makefile.build:599: scripts/selinux] Error 2 make[1]: *** Waiting for unfinished jobs.... Instead of relying on the host definition, include linux/socket.h in classmap.h to have PF_MAX. Signed-off-by: Paulo Alcantara <paulo@paulo.ac> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> [PM: manually merge in mdp.c, subject line tweaks] Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'scripts/selinux')
-rw-r--r--scripts/selinux/genheaders/genheaders.c1
-rw-r--r--scripts/selinux/mdp/mdp.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 1ceedea847dd..544ca126a8a8 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -9,7 +9,6 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#include <sys/socket.h>
struct security_class_mapping {
const char *name;
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
index edaba8e51651..18fd6143888b 100644
--- a/scripts/selinux/mdp/mdp.c
+++ b/scripts/selinux/mdp/mdp.c
@@ -32,7 +32,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sys/socket.h>
#include <linux/kconfig.h>
static void usage(char *name)