UBUNTU: [Config] Align riscv64 CONFIG_LSM with other architectures

BugLink: https://bugs.launchpad.net/bugs/1981437
The CONFIG_LSM option for riscv64 is doesn't enable the landlock module
at boot. Add it and align riscv64 with all the other archituctures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9a98afa43a5d520fcabd9437b202fb963e517180..b26ca8c8e345e051dbd97b8ae5d8742b8d6a0db7 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -305,7 +305,6 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
-CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MARVELL_88X2222_PHY=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 83aaab39a33d319b9c700da3f603a251197f961c..b6a86112b7897ae1039aa9fe40e4e3b0b4146384 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -13813,7 +13813,7 @@ CONFIG_HARDEN_BRANCH_HISTORY                    policy<{'armhf': 'y'}>
 CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY          policy<{'arm64': 'y'}>
 CONFIG_FORTIFY_SOURCE                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}>
 CONFIG_STATIC_USERMODEHELPER                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
-CONFIG_LSM                                      policy<{'amd64': '"landlock,lockdown,yama,integrity,apparmor"', 'arm64': '"landlock,lockdown,yama,integrity,apparmor"', 'armhf': '"landlock,lockdown,yama,integrity,apparmor"', 'ppc64el': '"landlock,lockdown,yama,integrity,apparmor"', 'riscv64': '"lockdown,yama,integrity,apparmor"', 's390x': '"landlock,lockdown,yama,integrity,apparmor"'}>
+CONFIG_LSM                                      policy<{'amd64': '"landlock,lockdown,yama,integrity,apparmor"', 'arm64': '"landlock,lockdown,yama,integrity,apparmor"', 'armhf': '"landlock,lockdown,yama,integrity,apparmor"', 'ppc64el': '"landlock,lockdown,yama,integrity,apparmor"', 'riscv64': '"landlock,lockdown,yama,integrity,apparmor"', 's390x': '"landlock,lockdown,yama,integrity,apparmor"'}>
 #
 CONFIG_SECURITY_DMESG_RESTRICT                  mark<ENFORCED>
 CONFIG_LSM                                      mark<ENFORCED>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a1f1eef05e0bd501d58f3e87a96cc6ce4a931821..ecd4827b98ff5422c3439aa17a79709a734d75a1 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -320,7 +320,6 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
-CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MARVELL_88X2222_PHY=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 4052999bfd5015a86c60992d75322fae7a1cab58..59d03a82a726eaed42e92e45f92eab9161026f7e 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -309,7 +309,6 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
-CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MARVELL_88X2222_PHY=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 031dbcc0aacd738b0d91066274b47fab579aa7aa..c80b98a2f887ce8de2efff0d962ea214c712258c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6057,6 +6057,7 @@ CONFIG_LPARCFG=y
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
 CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 CONFIG_LSM_MMAP_MIN_ADDR=0
 CONFIG_LS_EXTIRQ=y
 CONFIG_LS_SCFG_MSI=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 17a85a9bcfb73b9bcf7772cc185c4b63fb5d0fff..9e34e19cd7b60d9b8814fe74e4938942eeaae3b1 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -311,7 +311,6 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
-CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MARVELL_88X2222_PHY=m

diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index c959f96a34fafd20875287abb29d07bfe19c0265..1e150e3e6e11e50bf833317e1241b55473d6914d 100644 (file)
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -305,7 +305,6 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
-CONFIG_LSM="lockdown,yama,integrity,apparmor"
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MARVELL_88X2222_PHY=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index f9573c2431518517a88e37e98272c0a22757c1ab..df8b0cf959c14fae58c04ffee189c326118f2d24 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -286,7 +286,6 @@ CONFIG_KVM=y
 CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
-CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor"
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MAILBOX is not set
 # CONFIG_MARVELL_88X2222_PHY is not set