Skip to contentSkip to conversation

selinux: do not include <linux/*.h> headers from host programs

PATCH In review Masahiro Yamada 2 participants 5 messages Sep 6, 2024 – Oct 3, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 selinux: do not include <linux/*.h> headers from host programs

The header, security/selinux/include/classmap.h, is included not only from kernel space but also from host programs.

It includes <linux/capability.h> and <linux/socket.h>, which pull in more <linux/*.h> headers. This makes the host programs less portable, specifically causing build errors on macOS.

Those headers are included for the following purposes:

- <linux/capability.h> for checking CAP_LAST_CAP
- <linux/socket.h> for checking PF_MAX

These checks can be guarded by __KERNEL__ so they are skipped when building host programs. Testing them when building the kernel should be sufficient.

The header, security/selinux/include/initial_sid_to_string.h, includes <linux/stddef.h> for the NULL definition, but this is not portable either. Instead, <stddef.h> should be included for host programs.

---

Changes in v2:
- Reword the commit description
- Keep the location of CAP_LAST_CAP
- Include <stddef.h> for host programs

 scripts/selinux/genheaders/Makefile              |  4 +---
 scripts/selinux/genheaders/genheaders.c          |  3 ---
 scripts/selinux/mdp/Makefile                     |  2 +-
 scripts/selinux/mdp/mdp.c                        |  4 ----
 security/selinux/include/classmap.h              | 11 ++++++++---
 security/selinux/include/initial_sid_to_string.h |  4 ++++
 6 files changed, 14 insertions(+), 14 deletions(-)
scripts/selinux/genheaders/Makefile +1 -3
index 1faf7f07e8db..866f60e78882 100644
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 hostprogs-always-y += genheaders
-HOST_EXTRACFLAGS += \
-	-I$(srctree)/include/uapi -I$(srctree)/include \
-	-I$(srctree)/security/selinux/include
+HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include
scripts/selinux/genheaders/genheaders.c +0 -3
index 15520806889e..3834d7eb0af6 100644
@@ -1,8 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 
-/* NOTE: we really do want to use the kernel headers here */
-#define __EXPORTED_HEADERS__
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
scripts/selinux/mdp/Makefile +1 -1
index d61058ddd15c..673782e3212f 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 hostprogs-always-y += mdp
 HOST_EXTRACFLAGS += \
-	-I$(srctree)/include/uapi -I$(srctree)/include \
+	-I$(srctree)/include \
 	-I$(srctree)/security/selinux/include -I$(objtree)/include
 
 clean-files	:= policy.* file_contexts
scripts/selinux/mdp/mdp.c +0 -4
index 1415604c3d24..52365921c043 100644
@@ -11,10 +11,6 @@
  * Authors: Serge E. Hallyn <[email protected]>
  */
 
-
-/* NOTE: we really do want to use the kernel headers here */
-#define __EXPORTED_HEADERS__
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
security/selinux/include/classmap.h +8 -3
index 7229c9bf6c27..5e2b0eaa73c4 100644
@@ -1,8 +1,5 @@
 /* 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"
@@ -36,9 +33,13 @@
 	"mac_override", "mac_admin", "syslog", "wake_alarm", "block_suspend", \
 		"audit_read", "perfmon", "bpf", "checkpoint_restore"
 
+#ifdef __KERNEL__ /* avoid this check when building host programs */
+#include <linux/capability.h>
+
 #if CAP_LAST_CAP > CAP_CHECKPOINT_RESTORE
 #error New capability defined, please update COMMON_CAP2_PERMS.
 #endif
+#endif
 
 /*
  * Note: The name for any socket class should be suffixed by "socket",
@@ -181,6 +182,10 @@ const struct security_class_mapping secclass_map[] = {
 	{ NULL }
 };
 
+#ifdef __KERNEL__ /* avoid this check when building host programs */
+#include <linux/socket.h>
+
 #if PF_MAX > 46
 #error New address family defined, please update secclass_map.
 #endif
+#endif
security/selinux/include/initial_sid_to_string.h +4 -0
index 99b353b2abb4..d7ba60b62491 100644
@@ -1,6 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
+#ifdef __KERNEL__
 #include <linux/stddef.h>
+#else
+#include <stddef.h>
+#endif
 
 static const char *const initial_sid_to_string[] = {
 	NULL, /* zero placeholder, not used */
Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 2/2 selinux: move genheaders to security/selinux/

This tool is only used in security/selinux/Makefile.

Move it to security/selinux/ so that 'make clean' can clean it up.

Please note 'make clean' does not clean scripts/ because tools under scripts/ are often used for external module builds. Obviously, genheaders is not the case here.

---

Changes in v2:
- Add more reason to move genheaders to security/selinux/

 scripts/remove-stale-files                                 | 3 +++
 scripts/selinux/Makefile                                   | 2 +-
 scripts/selinux/genheaders/.gitignore                      | 2 --
 scripts/selinux/genheaders/Makefile                        | 3 ---
 security/selinux/.gitignore                                | 1 +
 security/selinux/Makefile                                  | 7 +++++--
 .../selinux/genheaders => security/selinux}/genheaders.c   | 0
 7 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 scripts/selinux/genheaders/.gitignore
 delete mode 100644 scripts/selinux/genheaders/Makefile
 rename {scripts/selinux/genheaders => security/selinux}/genheaders.c (100%)
scripts/remove-stale-files +3 -0
index f38d26b78c2a..4e7d25668a98 100755
@@ -20,4 +20,7 @@ set -e
 # yard. Stale files stay in this file for a while (for some release cycles?),
 # then will be really dead and removed from the code base entirely.
 
+# moved to security/selinux/genheaders
+rm -f scripts/selinux/genheaders/genheaders
+
 rm -f *.spec
scripts/selinux/Makefile +1 -1
index 59494e14989b..4b1308fa5732 100644
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-subdir-y := mdp genheaders
+subdir-y := mdp
scripts/selinux/genheaders/.gitignore deleted +0 -2
deleted file mode 100644
index 5fcadd307908..000000000000
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-genheaders
scripts/selinux/genheaders/Makefile deleted +0 -3
deleted file mode 100644
index 866f60e78882..000000000000
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-hostprogs-always-y += genheaders
-HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include
security/selinux/.gitignore +1 -0
index 168fae13ca5a..01c0df8ab009 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 av_permissions.h
 flask.h
+/genheaders
security/selinux/Makefile +5 -2
index c47519ed8156..86f0575f670d 100644
@@ -36,7 +36,10 @@ quiet_cmd_genhdrs = GEN     $(addprefix $(obj)/,$(genhdrs))
 # see the note above, replace the $targets and 'flask.h' rule with the lines
 # below:
 #  targets += $(genhdrs)
-#  $(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/...
+#  $(addprefix $(obj)/,$(genhdrs)) &: $(obj)/genheaders FORCE
 targets += flask.h
-$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE
+$(obj)/flask.h: $(obj)/genheaders FORCE
 	$(call if_changed,genhdrs)
+
+hostprogs := genheaders
+HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include
security/selinux/genheaders.c renamed from scripts/selinux/genheaders/genheaders.c +0 -0
similarity index 100%
rename from scripts/selinux/genheaders/genheaders.c
rename to security/selinux/genheaders.c
Signature · 1 line
2.43.0
maintainer
#2 lore raw

Re: [PATCH v2 2/2] selinux: move genheaders to security/selinux/

Quoted 15 lines · Masahiro Yamada

This tool is only used in security/selinux/Makefile.

Move it to security/selinux/ so that 'make clean' can clean it up.

Please note 'make clean' does not clean scripts/ because tools under scripts/ are often used for external module builds. Obviously, genheaders is not the case here.

---

Changes in v2:
- Add more reason to move genheaders to security/selinux/

Quoted 11 lines
 scripts/remove-stale-files                                 | 3 +++
 scripts/selinux/Makefile                                   | 2 +-
 scripts/selinux/genheaders/.gitignore                      | 2 --
 scripts/selinux/genheaders/Makefile                        | 3 ---
 security/selinux/.gitignore                                | 1 +
 security/selinux/Makefile                                  | 7 +++++--
 .../selinux/genheaders => security/selinux}/genheaders.c   | 0
 7 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 scripts/selinux/genheaders/.gitignore
 delete mode 100644 scripts/selinux/genheaders/Makefile
 rename {scripts/selinux/genheaders => security/selinux}/genheaders.c (100%)

Better, thank you. See my comments on patch 1/2 for when you can expect this to be merged into the SELinux tree.

Signature · 1 line
paul-moore.com
maintainer
#3 lore raw
In reply to Masahiro Yamada
Quoted 32 lines · Masahiro Yamada

The header, security/selinux/include/classmap.h, is included not only from kernel space but also from host programs.

It includes <linux/capability.h> and <linux/socket.h>, which pull in more <linux/*.h> headers. This makes the host programs less portable, specifically causing build errors on macOS.

Those headers are included for the following purposes:

- <linux/capability.h> for checking CAP_LAST_CAP
- <linux/socket.h> for checking PF_MAX

These checks can be guarded by __KERNEL__ so they are skipped when building host programs. Testing them when building the kernel should be sufficient.

The header, security/selinux/include/initial_sid_to_string.h, includes <linux/stddef.h> for the NULL definition, but this is not portable either. Instead, <stddef.h> should be included for host programs.

---

Changes in v2:
- Reword the commit description
- Keep the location of CAP_LAST_CAP
- Include <stddef.h> for host programs

Quoted 7 lines
 scripts/selinux/genheaders/Makefile              |  4 +---
 scripts/selinux/genheaders/genheaders.c          |  3 ---
 scripts/selinux/mdp/Makefile                     |  2 +-
 scripts/selinux/mdp/mdp.c                        |  4 ----
 security/selinux/include/classmap.h              | 11 ++++++++---
 security/selinux/include/initial_sid_to_string.h |  4 ++++
 6 files changed, 14 insertions(+), 14 deletions(-)

This looks much better, thank you. We're currently at -rc6 which is later than I would like to merge patches like this (I try to stick to bug fixes or trivial changes at this point in the development cycle), so I'm going to hold on to this until after the upcoming merge window where I'll merge it into selinux/dev. See the below doc for more information on how the SELinux tree is managed:

https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git/tree/README.md

Signature · 1 line
paul-moore.com
maintainer
#4 lore raw
Quoted 41 lines · Paul Moore
Quoted 32 lines · Masahiro Yamada

The header, security/selinux/include/classmap.h, is included not only from kernel space but also from host programs.

It includes <linux/capability.h> and <linux/socket.h>, which pull in more <linux/*.h> headers. This makes the host programs less portable, specifically causing build errors on macOS.

Those headers are included for the following purposes:

- <linux/capability.h> for checking CAP_LAST_CAP
- <linux/socket.h> for checking PF_MAX

These checks can be guarded by __KERNEL__ so they are skipped when building host programs. Testing them when building the kernel should be sufficient.

The header, security/selinux/include/initial_sid_to_string.h, includes <linux/stddef.h> for the NULL definition, but this is not portable either. Instead, <stddef.h> should be included for host programs.

---

Changes in v2:
- Reword the commit description
- Keep the location of CAP_LAST_CAP
- Include <stddef.h> for host programs

Quoted 7 lines
 scripts/selinux/genheaders/Makefile              |  4 +---
 scripts/selinux/genheaders/genheaders.c          |  3 ---
 scripts/selinux/mdp/Makefile                     |  2 +-
 scripts/selinux/mdp/mdp.c                        |  4 ----
 security/selinux/include/classmap.h              | 11 ++++++++---
 security/selinux/include/initial_sid_to_string.h |  4 ++++
 6 files changed, 14 insertions(+), 14 deletions(-)
Quoted 8 lines

This looks much better, thank you. We're currently at -rc6 which is later than I would like to merge patches like this (I try to stick to bug fixes or trivial changes at this point in the development cycle), so I'm going to hold on to this until after the upcoming merge window where I'll merge it into selinux/dev. See the below doc for more information on how the SELinux tree is managed:

https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git/tree/README.md

I just merged this into selinux/dev, you should see it reflected in the kernel.org shortly.

Signature · 1 line
paul-moore.com