Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Paulo Alcantara and committed by
Paul Moore
ff1bf4c0 e37c1877

+1 -2
-1
scripts/selinux/genheaders/genheaders.c
··· 9 9 #include <string.h> 10 10 #include <errno.h> 11 11 #include <ctype.h> 12 - #include <sys/socket.h> 13 12 14 13 struct security_class_mapping { 15 14 const char *name;
-1
scripts/selinux/mdp/mdp.c
··· 32 32 #include <stdlib.h> 33 33 #include <unistd.h> 34 34 #include <string.h> 35 - #include <sys/socket.h> 36 35 #include <linux/kconfig.h> 37 36 38 37 static void usage(char *name)
+1
security/selinux/include/classmap.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #include <linux/capability.h> 3 + #include <linux/socket.h> 3 4 4 5 #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ 5 6 "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"