@@ -303,7 +303,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
@@ -13838,7 +13838,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>
@@ -318,7 +318,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
@@ -308,7 +308,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
@@ -6021,6 +6021,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
@@ -309,7 +309,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
@@ -303,7 +303,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
@@ -284,7 +284,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
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> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 2 insertions(+), 7 deletions(-)