diff mbox series

[2/4] UBUNTU: [Config] Disable CONFIG_MANDATORY_FILE_LOCKING

Message ID 20210820071002.3560053-3-keescook@chromium.org
State New
Headers show
Series Various config tweaks | expand

Commit Message

Kees Cook Aug. 20, 2021, 7:10 a.m. UTC 
From: Kees Cook <kees@ubuntu.com>

Upstream is trying to remove this feature. It appears to be unused and
causes maintenance burdens. Disable in common config and enforce in
policy.

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1940392

Signed-off-by: Kees Cook <kees@ubuntu.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 7599bf532a0b..0092f241d013 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10445,7 +10445,7 @@  CONFIG_ZONEFS_FS                                policy<{'amd64': 'm', 'arm64': '
 CONFIG_FS_DAX                                   policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_EXPORTFS_BLOCK_OPS                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FILE_LOCKING                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_MANDATORY_FILE_LOCKING                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_MANDATORY_FILE_LOCKING                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_FS_ENCRYPTION                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FS_ENCRYPTION_INLINE_CRYPT               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FS_VERITY                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8f140f6fb4db..5af18fe4b2d5 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5783,7 +5783,7 @@  CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 CONFIG_MAILBOX_TEST=m
 CONFIG_MANAGER_SBS=m
-CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_MANTIS_CORE=m
 CONFIG_MAPPING_DIRTY_HELPERS=y
 # CONFIG_MARCH_Z10 is not set