From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F00D3F54A2; Tue, 5 May 2026 09:05:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777971939; cv=none; b=aDxuH41b030EOOPwZw4f4iK5XtaYCjz4madKkpHjl7O3juB0XA84cr6zMDH99Si9Th9Jfop/V2XtEvINHVw4aWaQ23Z5SbSjcRl/kQ8c2YdrlnCRkbne9CogWs9mMfGsaD/QF9mKDdMs3QZQh4/Sg8NDRN3z4khnoV0nHBedX8k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777971939; c=relaxed/simple; bh=chCyrFKTgdh3bqAx/mQ6lIysEIJoVqpFJGF/rlIkqi4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y2xA6FQm1R1FqGTHGBNqfbcxyBeX5yE48l6zjQcJlNZIh4ZQJkbokVGNVzLxzqRtLV3kHSUKOAGYAS3xlYaady06m5+0n1OS0kGiWGbtaQYbw9l014JTO7dO/5qv8diA1ogD2o/mxeczBOHX0A/laFND2s2gNyRI+TlMMC4LEpg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=uSjcE3/7; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="uSjcE3/7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1777971923; bh=chCyrFKTgdh3bqAx/mQ6lIysEIJoVqpFJGF/rlIkqi4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uSjcE3/7RPzqVxYeknvP09UES2PQcOS9VkYVVqueNpzecmFvo1an3XpkguzW1D0Bg nFEHj3iswoLhusE/F96Ei5XojOmHw/x30HPACKMdW35EThCzDfqEd2VucH5aOjSyPt ZadmbkICr/8be6TA7uVP9y8q16Xm891dDk9OoxpA= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 05 May 2026 11:05:14 +0200 Subject: [PATCH v5 10/14] module: Prepare for additional module authentication mechanisms Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260505-module-hashes-v5-10-e174a5a49fce@weissschuh.net> References: <20260505-module-hashes-v5-0-e174a5a49fce@weissschuh.net> In-Reply-To: <20260505-module-hashes-v5-0-e174a5a49fce@weissschuh.net> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Nathan Chancellor , Nicolas Schier , Arnd Bergmann , Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Paul Moore , James Morris , "Serge E. Hallyn" , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Naveen N Rao , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Nicolas Schier , Daniel Gomez , Aaron Tomlin , "Christophe Leroy (CS GROUP)" , Nicolas Bouchinet , Xiu Jianfeng , Christophe Leroy Cc: Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , bpf@vger.kernel.org, =?utf-8?q?Fabian_Gr=C3=BCnbichler?= , Arnout Engelen , Mattia Rizzolo , kpcyrd , Christian Heusel , =?utf-8?q?C=C3=A2ju_Mihai-Drosi?= , Eric Biggers , Sebastian Andrzej Siewior , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-modules@vger.kernel.org, linux-security-module@vger.kernel.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-integrity@vger.kernel.org, debian-kernel@lists.debian.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777971921; l=2563; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=chCyrFKTgdh3bqAx/mQ6lIysEIJoVqpFJGF/rlIkqi4=; b=AghgISpSvC9jFLJMASwIQ2fl2y7giwEV7IIPQJiNe92PMZ8lKZf0qC99jV/SdHmNA1NchS945 I53O1yr0Ve6Cw+2TVu7rpkv9iMeNkP/+D4AMPAnvVv3dujuIZnIrT4f X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Reorganize the code to make it easier to add the new hash-based module authentication. Also drop the now unnecessary stub for module_sig_check(). Signed-off-by: Thomas Weißschuh --- kernel/module/auth.c | 17 ++++++++++++++--- kernel/module/internal.h | 8 -------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/kernel/module/auth.c b/kernel/module/auth.c index 21e49eb4967c..2ee512d26790 100644 --- a/kernel/module/auth.c +++ b/kernel/module/auth.c @@ -37,6 +37,14 @@ void set_module_sig_enforced(void) sig_enforce = true; } +static __always_inline bool mod_sig_type_valid(enum module_signature_type id_type) +{ + if (id_type == MODULE_SIGNATURE_TYPE_PKCS7 && IS_ENABLED(CONFIG_MODULE_SIG)) + return true; + + return false; +} + static int mod_verify_sig(const void *mod, struct load_info *info) { struct module_signature ms; @@ -48,8 +56,8 @@ static int mod_verify_sig(const void *mod, struct load_info *info) memcpy(&ms, mod + (modlen - sizeof(ms)), sizeof(ms)); - if (ms.id_type != MODULE_SIGNATURE_TYPE_PKCS7) { - pr_err("module: not signed with expected PKCS#7 message\n"); + if (!mod_sig_type_valid(ms.id_type)) { + pr_err("module: not signed with expected signature\n"); return -ENOPKG; } @@ -61,7 +69,10 @@ static int mod_verify_sig(const void *mod, struct load_info *info) modlen -= sig_len + sizeof(ms); info->len = modlen; - return module_sig_check(mod, modlen, mod + modlen, sig_len); + if (ms.id_type == MODULE_SIGNATURE_TYPE_PKCS7 && IS_ENABLED(CONFIG_MODULE_SIG)) + return module_sig_check(mod, modlen, mod + modlen, sig_len); + + return 0; } int module_auth_check(struct load_info *info, int flags) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index d923e31a5d8e..aabe7f8e1af4 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -335,15 +335,7 @@ int module_enforce_rwx_sections(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, void module_mark_ro_after_init(const Elf_Ehdr *hdr, Elf_Shdr *sechdrs, const char *secstrings); -#ifdef CONFIG_MODULE_SIG int module_sig_check(const void *mod, size_t mod_len, const void *sig, size_t sig_len); -#else /* !CONFIG_MODULE_SIG */ -static inline int module_sig_check(const void *mod, size_t mod_len, - const void *sig, size_t sig_len) -{ - return 0; -} -#endif /* !CONFIG_MODULE_SIG */ #ifdef CONFIG_MODULE_AUTH int module_auth_check(struct load_info *info, int flags); -- 2.54.0