History

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.

Paulo Alcantara committed 7 years ago

Commit dfbd1991 parent 6a1afff3 files · +1 −2Browse files

Unified · Split

3 files
  1. scripts/selinux/genheaders/genheaders.c +0 −1
  2. scripts/selinux/mdp/mdp.c +0 −1
  3. security/selinux/include/classmap.h +1 −0
scripts/selinux/genheaders/genheaders.c+0−1
@@ -9,7 +9,6 @@ · 8 unmodified lines
99 #include <string.h>
1010 #include <errno.h>
1111 #include <ctype.h>
12−#include <sys/socket.h>
1312
1413 struct security_class_mapping {
1514 const char *name;
scripts/selinux/mdp/mdp.c+0−1
@@ -32,7 +32,6 @@ · 31 unmodified lines
3232 #include <stdlib.h>
3333 #include <unistd.h>
3434 #include <string.h>
35−#include <sys/socket.h>
3635
3736 static void usage(char *name)
3837 {
security/selinux/include/classmap.h+1−0
@@ -1,5 +1,6 @@
11 /* SPDX-License-Identifier: GPL-2.0 */
22 #include <linux/capability.h>
3+#include <linux/socket.h>
34
45 #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
56 "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"