-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "config: Enable CONFIG_SECURITY_SELINUX"
This reverts commit ce7277c. SELinux was enabled for crun-vm's [1] use case of running bootc-install, but the dependency on SELinux was since dropped. Re-disable SELinux to avoid bloat. This has no effect on the x86_64 image since its defconfig includes CONFIG_SECURITY_SELINUX=y, but it should help reduce the aarch64 image size. [1] https://github.com/containers/crun-vm Signed-off-by: Alberto Faria <[email protected]>
- Loading branch information
1 parent
f9bf3af
commit bb1506b
Showing
4 changed files
with
13 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,17 +22,15 @@ TODO - implement remote [get|set]sockopt | |
|
||
Signed-off-by: Sergio Lopez <[email protected]> | ||
--- | ||
include/linux/socket.h | 4 +- | ||
net/Kconfig | 1 + | ||
net/Makefile | 1 + | ||
net/socket.c | 1 + | ||
net/tsi/Kconfig | 7 + | ||
net/tsi/Makefile | 4 + | ||
net/tsi/af_tsi.c | 1280 +++++++++++++++++++++++++++ | ||
net/tsi/af_tsi.h | 100 +++ | ||
security/selinux/hooks.c | 2 +- | ||
security/selinux/include/classmap.h | 2 +- | ||
10 files changed, 1399 insertions(+), 3 deletions(-) | ||
include/linux/socket.h | 4 +- | ||
net/Kconfig | 1 + | ||
net/Makefile | 1 + | ||
net/socket.c | 1 + | ||
net/tsi/Kconfig | 7 + | ||
net/tsi/Makefile | 4 + | ||
net/tsi/af_tsi.c | 1280 ++++++++++++++++++++++++++++++++++++++++ | ||
net/tsi/af_tsi.h | 100 ++++ | ||
8 files changed, 1397 insertions(+), 1 deletion(-) | ||
create mode 100644 net/tsi/Kconfig | ||
create mode 100644 net/tsi/Makefile | ||
create mode 100644 net/tsi/af_tsi.c | ||
|
@@ -1509,31 +1507,6 @@ index 000000000000..cf381734bebe | |
+} __attribute__((packed)); | ||
+ | ||
+#endif | ||
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c | ||
index 53cfeefb2f19..428801687e5c 100644 | ||
--- a/security/selinux/hooks.c | ||
+++ b/security/selinux/hooks.c | ||
@@ -1295,7 +1295,7 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc | ||
return SECCLASS_XDP_SOCKET; | ||
case PF_MCTP: | ||
return SECCLASS_MCTP_SOCKET; | ||
-#if PF_MAX > 46 | ||
+#if PF_MAX > 47 | ||
#error New address family defined, please update this function. | ||
#endif | ||
} | ||
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h | ||
index a3c380775d41..06cb017611f8 100644 | ||
--- a/security/selinux/include/classmap.h | ||
+++ b/security/selinux/include/classmap.h | ||
@@ -259,6 +259,6 @@ const struct security_class_mapping secclass_map[] = { | ||
{ NULL } | ||
}; | ||
|
||
-#if PF_MAX > 46 | ||
+#if PF_MAX > 47 | ||
#error New address family defined, please update secclass_map. | ||
#endif | ||
-- | ||
2.43.0 | ||
|