From b727ed2cc24f693a6895867322f5f20e671312e5 Mon Sep 17 00:00:00 2001 From: GUO Zihua Date: Sat, 17 Sep 2022 14:53:15 +0800 Subject: [PATCH 1/2] Revert "Enable module KASAN" This reverts commit f4cf27d959e0b2726b2298c81391dd44c55ec1a4. Signed-off-by: GUO Zihua Change-Id: Ie0c42398b84a694259f74e7e0b171d1a638e44f7 --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index f627acd..556ea22 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -277,7 +277,6 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=3 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_KASAN_SHADOW_OFFSET=0xdfffffd000000000 # # Platform selection @@ -6655,11 +6654,6 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_CC_HAS_KASAN_GENERIC=y -CONFIG_KASAN=y -CONFIG_KASAN_GENERIC=y -CONFIG_KASAN_OUTLINE=y -# CONFIG_KASAN_INLINE is not set -CONFIG_TEST_KASAN_MODULE=m # end of Memory Debugging # CONFIG_DEBUG_SHIRQ is not set @@ -6800,8 +6794,7 @@ CONFIG_STRICT_DEVMEM=y # # Kernel Testing and Coverage # -CONFIG_KUNIT=y -CONFIG_KASAN_KUNIT_TEST=y +# CONFIG_KUNIT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y -- Gitee From 90e9032032fd475780876cb7ae3cf836495dabeb Mon Sep 17 00:00:00 2001 From: GUO Zihua Date: Sat, 17 Sep 2022 14:53:25 +0800 Subject: [PATCH 2/2] Revert "Test: enable module sig" This reverts commit d31de75bfbf7985158afcc35a8f0c19d32c28342. Signed-off-by: GUO Zihua Change-Id: I62df2e9d8a7711ce16c4fc560cc6c263695dab55 --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 556ea22..38ec124 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -685,18 +685,13 @@ CONFIG_HAVE_GCC_PLUGINS=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -CONFIG_MODULE_SIG_FORMAT=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_MODULE_SIG=y -CONFIG_MODULE_SIG_FORCE=y -CONFIG_MODULE_SIG_ALL=y -CONFIG_MODULE_SIG_SHA256=y -CONFIG_MODULE_SIG_HASH="sha256" +# CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_UNUSED_SYMBOLS is not set @@ -6435,7 +6430,6 @@ CONFIG_PKCS7_MESSAGE_PARSER=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -- Gitee