Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 521b70f1082a7400d5635f70d86f2ad3e7518439 Mon Sep 17 00:00:00 2001
From de5bb7b5770c60ae3df9b9ee276fde22f62b18fd Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Mon, 4 Dec 2023 12:17:25 +0100
Subject: [PATCH] Flatcar modifications
Comment on lines +1 to 4
Expand All @@ -10,12 +10,12 @@ Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
policy/modules/kernel/corenetwork.if.in | 26 ++++
policy/modules/kernel/corenetwork.te.in | 12 +-
policy/modules/kernel/files.if | 45 ++++++
policy/modules/kernel/kernel.te | 125 +++++++++++++++++
policy/modules/kernel/kernel.te | 133 ++++++++++++++++++
policy/modules/services/container.fc | 6 +
policy/modules/services/container.te | 178 +++++++++++++++++++++++-
policy/modules/system/init.te | 8 ++
policy/modules/system/locallogin.te | 9 +-
9 files changed, 426 insertions(+), 3 deletions(-)
9 files changed, 434 insertions(+), 3 deletions(-)

diff --git a/policy/modules/admin/netutils.te b/policy/modules/admin/netutils.te
index 286cae13b..aae2f8d21 100644
Expand Down Expand Up @@ -169,10 +169,10 @@ index 47698fd77..710ba58ac 100644
+ relabelfrom_chr_files_pattern($1, { file_type -policy_config_t $2 }, { file_type -policy_config_t $2 })
+')
diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te
index 9161da0aa..3fa9c58a1 100644
index 9161da0aa..a43c68fef 100644
--- a/policy/modules/kernel/kernel.te
+++ b/policy/modules/kernel/kernel.te
@@ -388,6 +388,131 @@ files_mounton_default(kernel_t)
@@ -388,6 +388,139 @@ files_mounton_default(kernel_t)

mcs_process_set_categories(kernel_t)

Expand Down Expand Up @@ -300,6 +300,14 @@ index 9161da0aa..3fa9c58a1 100644
+# avc: denied { bpf } for pid=[0-9]* comm="runc" capability=39 scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=capability2 permissive=0
+#
+allow kernel_t self:capability2 { bpf };
+
+#
+# FLATCAR:
+#
+# This one happens in kubeadm.*.calico*.
+#
+# avc: denied { execmem } for pid=2873 comm="calico-node" scontext=system_u:system_r:kernel_t:s0 tcontext=system_u:system_r:kernel_t:s0 tclass=process permissive=0
+allow kernel_t self:process { execmem };
Comment on lines +307 to +310

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that was my thinking even before I saw Copilot's message.

+
mls_process_read_all_levels(kernel_t)
mls_process_write_all_levels(kernel_t)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,4 @@ The following steps were needed to make these patches:
- Apply our changes:
- `git am -p2 <OUR_PATCH>` should do the trick. Try adding `-3` flag
in case of conflicts.
- Generate the patch:
- Since sec-policy/selinux- packages set their source directory to
work directory (in Gentooese: `S=${WORKDIR}/`), the user patches
are applied from the parent directory of the refpolicy sources. In
order to generate proper patches, do `git format-patch
--src-prefix=a/refpolicy/ --dst-prefix=b/refpolicy/
<SINCE_COMMIT>`
- Generate the patch