From d31de75bfbf7985158afcc35a8f0c19d32c28342 Mon Sep 17 00:00:00 2001 From: GUO Zihua Date: Tue, 13 Sep 2022 10:36:42 +0800 Subject: [PATCH 1/2] Test: enable module sig Signed-off-by: GUO Zihua Change-Id: I92bdcd6f5db2eec915433b4104fe40b6e077d693 --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 38ec124..556ea22 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -685,13 +685,18 @@ 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 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_COMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_UNUSED_SYMBOLS is not set @@ -6430,6 +6435,7 @@ 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 From f4cf27d959e0b2726b2298c81391dd44c55ec1a4 Mon Sep 17 00:00:00 2001 From: lk_hauwei Date: Tue, 13 Sep 2022 15:12:06 +0800 Subject: [PATCH 2/2] Enable module KASAN Signed-off-by: lk_hauwei Change-Id: I1932f20e89a486ada043a48067060c7ee4b1d552 --- linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 556ea22..f627acd 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -277,6 +277,7 @@ 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 @@ -6654,6 +6655,11 @@ 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 @@ -6794,7 +6800,8 @@ CONFIG_STRICT_DEVMEM=y # # Kernel Testing and Coverage # -# CONFIG_KUNIT is not set +CONFIG_KUNIT=y +CONFIG_KASAN_KUNIT_TEST=y # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y -- Gitee