Skip to contentSkip to conversation

linux-%: remove kernel fragments now in cache

PATCH In review Armin Kuster 2 participants 5 messages Aug 13, 2019 – Aug 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 linux-%: remove kernel fragments now in cache

---
 recipes-kernel/linux/linux-%.bbapend             | 9 ---------
 recipes-kernel/linux/linux/apparmor.cfg          | 9 ---------
 recipes-kernel/linux/linux/apparmor_on_boot.cfg  | 1 -
 recipes-kernel/linux/linux/smack-default-lsm.cfg | 2 --
 recipes-kernel/linux/linux/smack.cfg             | 7 -------
 5 files changed, 28 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-%.bbapend
 delete mode 100644 recipes-kernel/linux/linux/apparmor.cfg
 delete mode 100644 recipes-kernel/linux/linux/apparmor_on_boot.cfg
 delete mode 100644 recipes-kernel/linux/linux/smack-default-lsm.cfg
 delete mode 100644 recipes-kernel/linux/linux/smack.cfg
recipes-kernel/linux/linux-%.bbapend deleted +0 -9
deleted file mode 100644
index ec7adeb..0000000
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
-
-SRC_URI += "\
-        ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \
-        ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor_on_boot.cfg', '', d)} \
-        ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack.cfg', '', d)} \
-        ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack-default-lsm.cfg', '', d)} \
-        ${@bb.utils.contains('DISTRO_FEATURES', 'yama', ' file://yama.cfg', '', d)} \
-"
recipes-kernel/linux/linux/apparmor.cfg deleted +0 -9
deleted file mode 100644
index ae6cdcd..0000000
@@ -1,9 +0,0 @@
-CONFIG_AUDIT=y
-CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-CONFIG_INTEGRITY_AUDIT=y
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
-CONFIG_DEFAULT_SECURITY="apparmor"
-CONFIG_AUDIT_GENERIC=y
recipes-kernel/linux/linux/apparmor_on_boot.cfg deleted +0 -1
deleted file mode 100644
index fc35740..0000000
@@ -1 +0,0 @@
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
recipes-kernel/linux/linux/smack-default-lsm.cfg deleted +0 -2
deleted file mode 100644
index b5c4845..0000000
@@ -1,2 +0,0 @@
-CONFIG_DEFAULT_SECURITY="smack"
-CONFIG_DEFAULT_SECURITY_SMACK=y
recipes-kernel/linux/linux/smack.cfg deleted +0 -7
deleted file mode 100644
index 0d5fc64..0000000
@@ -1,7 +0,0 @@
-CONFIG_NETLABEL=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_SMACK=y
-CONFIG_SECURITY_SMACK_BRINGUP=y
-CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
-CONFIG_TMPFS_XATTR=y
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 meta-integrity: remove kernel fragments now in cache

---
 .../recipes-kernel/linux/linux-%.bbappend      |  5 ++---
 .../recipes-kernel/linux/linux/ima.cfg         | 18 ------------------
 .../linux/linux/ima_evm_root_ca.cfg            |  3 ---
 .../recipes-kernel/linux/linux/modsign.cfg     |  5 -----
 .../recipes-kernel/linux/linux/modsign.scc     |  4 ----
 5 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 meta-integrity/recipes-kernel/linux/linux/ima.cfg
 delete mode 100644 meta-integrity/recipes-kernel/linux/linux/ima_evm_root_ca.cfg
 delete mode 100644 meta-integrity/recipes-kernel/linux/linux/modsign.cfg
 delete mode 100644 meta-integrity/recipes-kernel/linux/linux/modsign.scc
meta-integrity/recipes-kernel/linux/linux-%.bbappend +2 -3
index ca96c8d..f9a48cd 100644
@@ -1,6 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ima", " features/ima/ima.scc", "" ,d)}"
 
-SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ima', ' file://ima.cfg', '', d)}"
-SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'modsign', ' file://modsign.scc file://modsign.cfg', '', d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'modsign', ' features/ima/modsign.scc', '', d)}"
 
 inherit ${@bb.utils.contains('DISTRO_FEATURES', 'modsign', 'kernel-modsign', '', d)}
meta-integrity/recipes-kernel/linux/linux/ima.cfg deleted +0 -18
deleted file mode 100644
index b3e47ba..0000000
@@ -1,18 +0,0 @@
-CONFIG_IMA=y
-CONFIG_IMA_MEASURE_PCR_IDX=10
-CONFIG_IMA_NG_TEMPLATE=y
-CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
-CONFIG_IMA_DEFAULT_HASH_SHA1=y
-CONFIG_IMA_DEFAULT_HASH="sha1"
-CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_APPRAISE_BOOTPARAM=y
-CONFIG_IMA_TRUSTED_KEYRING=y
-CONFIG_SIGNATURE=y
-CONFIG_IMA_WRITE_POLICY=y
-CONFIG_IMA_READ_POLICY=y
-CONFIG_IMA_LOAD_X509=y
-CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der"
-
-#CONFIG_INTEGRITY_SIGNATURE=y
-#CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
-#CONFIG_INTEGRITY_TRUSTED_KEYRING=y
meta-integrity/recipes-kernel/linux/linux/ima_evm_root_ca.cfg deleted +0 -3
deleted file mode 100644
index 9a45425..0000000
@@ -1,3 +0,0 @@
-# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
-CONFIG_EVM_LOAD_X509=y
-CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
meta-integrity/recipes-kernel/linux/linux/modsign.cfg deleted +0 -5
deleted file mode 100644
index c0c4ebc..0000000
@@ -1,5 +0,0 @@
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
-CONFIG_MODULE_SIG_SHA256=y
-CONFIG_MODULE_SIG_HASH="sha256"
-CONFIG_MODULE_SIG_KEY="modsign_key.pem"
meta-integrity/recipes-kernel/linux/linux/modsign.scc deleted +0 -4
deleted file mode 100644
index bce78ae..0000000
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Kernel Module Signing (modsign) enablement"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware modsign.cfg
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/3 linux-stable/5.2: add stable bbappend

In reply to Armin Kuster
---
 recipes-kernel/linux/linux-stable_5.2.bbappend | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-stable_5.2.bbappend
recipes-kernel/linux/linux-stable_5.2.bbappend new file +4 -0
new file mode 100644
index 0000000..76b5df5
@@ -0,0 +1,4 @@
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}"
+
Signature · 1 line
2.17.1
#3 lore raw

Re: [meta-security][PATCH 3/3] linux-stable/5.2: add stable bbappend

Hi Armin,

Do you know where is linux-stable_5.2.bb?

Thanks,

--Hongzhi

Quoted 16 lines · Armin Kuster
---
  recipes-kernel/linux/linux-stable_5.2.bbappend | 4 ++++
  1 file changed, 4 insertions(+)

create mode 100644 recipes-kernel/linux/linux-stable_5.2.bbappend

recipes-kernel/linux/linux-stable_5.2.bbappend new file +4 -0
new file mode 100644
index 0000000..76b5df5
@@ -0,0 +1,4 @@
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}"
+
author
#4 lore raw

Re: [meta-security][PATCH 3/3] linux-stable/5.2: add stable bbappend

Quoted 3 lines · Song

Hi Armin,

Do you know where is linux-stable_5.2.bb?

yes. in meta-odroid.

I suspect we could just use linux-%_5.2.bb

- armin

Quoted 27 lines

Thanks,

--Hongzhi

Quoted 20 lines · Armin Kuster

---
  recipes-kernel/linux/linux-stable_5.2.bbappend | 4 ++++

  1 file changed, 4 insertions(+)

  create mode 100644 recipes-kernel/linux/linux-stable_5.2.bbappend

recipes-kernel/linux/linux-stable_5.2.bbappend new file +1 -0
new file mode 100644
index 0000000..76b5df5
@@ -0,0 +1,4 @@
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES",

"apparmor", " features/apparmor/apparmor.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}"
+