diff mbox series

[SRU,K,3/7] UBUNTU: [Config] Enable CONFIG_STRICT_DEVMEM on riscv64

Message ID 20220712160812.435824-4-emil.renner.berthing@canonical.com
State New
Headers show
Series Align more RISC-V config with other archs | expand

Commit Message

Emil Renner Berthing July 12, 2022, 4:08 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1981437

Filter access to /dev/mem like is done on all other architectures. There
is even a mark<ENFORCED> annotation on this option and yet it is still
disabled on riscv64. Let's fix that.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 4 ++--
 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, 3 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index fa470c2b275e..d91f7386eaaf 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -631,7 +631,6 @@  CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 # CONFIG_STANDALONE is not set
-CONFIG_STRICT_DEVMEM=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SURFACE_3_POWER_OPREGION=m
 CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index df95a02e1abb..2aeb5317ff9a 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11454,8 +11454,8 @@  CONFIG_DEBUG_IRQFLAGS                           policy<{'amd64': 'n', 'arm64': '
 CONFIG_STACKTRACE                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_WARN_ALL_UNSEEDED_RANDOM                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_PROVIDE_OHCI1394_DMA_INIT                policy<{'amd64': 'n'}>
-CONFIG_STRICT_DEVMEM                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}>
-CONFIG_IO_STRICT_DEVMEM                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_STRICT_DEVMEM                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
+CONFIG_IO_STRICT_DEVMEM                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 #
 CONFIG_STRICT_DEVMEM                            mark<ENFORCED>
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 7872c36393f8..d16f756ae2b4 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -661,7 +661,6 @@  CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
-CONFIG_STRICT_DEVMEM=y
 CONFIG_SUN_PARTITION=y
 # CONFIG_SURFACE_3_POWER_OPREGION is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5b76bc59006a..5d83b8c88699 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -645,7 +645,6 @@  CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
-CONFIG_STRICT_DEVMEM=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 017915d72f1d..779ebf3ab610 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -11242,6 +11242,7 @@  CONFIG_STM_SOURCE_HEARTBEAT=m
 CONFIG_STP=m
 CONFIG_STPMIC1_WATCHDOG=m
 CONFIG_STREAM_PARSER=y
+CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 # CONFIG_STRICT_SIGALTSTACK_SIZE is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 3747e951ceb2..fd2af4f363dc 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -640,7 +640,6 @@  CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
-CONFIG_STRICT_DEVMEM=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 6291ce6aa9d9..11c4156b085f 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -629,7 +629,6 @@  CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
-# CONFIG_STRICT_DEVMEM is not set
 CONFIG_SUN_PARTITION=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_SYSV68_PARTITION=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 2f9bd24159b7..4a64eaf15924 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -564,7 +564,6 @@  CONFIG_SERIAL_CORE=m
 # CONFIG_SSB is not set
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
-CONFIG_STRICT_DEVMEM=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set