From ccb9d39dc43cf53431a0d7609839ed9c7141972d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20C=20McCord?= Date: Mon, 2 Jan 2023 19:50:59 -0500 Subject: [PATCH] fix: disable magic sysrq Magic Sysrq should not be enabled by default. Fixes #645. Also ran the missing `make kernel-olddefconfig` Re-created from #646 (cherry picked from commit 4234510651ec4733513991940f9805fa9405827e) Signed-off-by: Noel Georgi --- kernel/build/config-amd64 | 4 ++-- kernel/build/config-arm64 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index cd317a5c9..1c060c8e7 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.4 Kernel Configuration +# Linux/x86 6.1.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -5731,7 +5731,7 @@ CONFIG_OBJTOOL=y # Generic Kernel Debugging Instruments # CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 CONFIG_MAGIC_SYSRQ_SERIAL=y CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" CONFIG_DEBUG_FS=y diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 index 8a3dedab6..6814ead04 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.4 Kernel Configuration +# Linux/arm64 6.1.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -8380,7 +8380,7 @@ CONFIG_FRAME_POINTER=y # Generic Kernel Debugging Instruments # CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 CONFIG_MAGIC_SYSRQ_SERIAL=y CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" CONFIG_DEBUG_FS=y