From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E0D53CFF60 for ; Tue, 26 May 2026 11:58:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779796721; cv=none; b=DV9h9MbDtDKIMM93KPLuIVIDSGzTTM1e5VSonof0wWPz8ZS11S0Hz3Jjw5HpFdS1Bjb6+e0d9SWdnv7OXxznYyiIHQMpUa/r4LccFP5wlI588rucvf+K6KJtuL7uWisWI2DjoKdjcA4DA8t4GVlUyVA0eqZMhvYpX6Xd76EHjYA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779796721; c=relaxed/simple; bh=5W28sDVkarRvqQjMAW82poEsdm8er4gFoT6JmY4x6m0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=um/Xvqmtom3sk1jBB3IAFdW+u9BUA0a6jY2EbTCZIt1bIB9UB5Y0veddDidfp5Se7E8FE5dndaV/ULpSum2e6mYGb8AGGlKJE1kGrMcucuORBk6vTB2/Bov4f7jO1Rvs+CZGq6LePmSAiorYAzcylBdYsq5faDwVolZc4UkeIP4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=VA0Jqz6j; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="VA0Jqz6j" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43d734223e4so6637757f8f.0 for ; Tue, 26 May 2026 04:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1779796711; x=1780401511; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=AcvYzWTe1Y/hmlEUR12/Xq71LkSjxZ5X+aWQvNFuVk4=; b=VA0Jqz6jVFQ3yG6JwjGmfh7ff1Fgh1ZUasbed4oLwSnhPy7hmDa+VJXhPlslsr2lf3 dCfGJ/BlvpK1djedBbs/RsSwK5sU6gfpJx8y7ghea+Iex1zA1kt4/BJ1gJrVVakaU4uW 3eykLx+EnyHxFFSbLmeIbeX83v8kggpomupg3YRCqE80PBMwgzB+a6ZAKXoX5sh9fJdZ 0yplQBP9f+MfgOhTiS5MqoerJ7SFFfLvBkmvNjcQWynCwIsp0xAQczN02eM+05m7iAnS adXc25rRVCCaBiYcu+s0zDLRDRgYRepTcPicuWltRB26Bf8Zx40bV1/0tKp1NQ5Nttxq x78Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779796711; x=1780401511; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AcvYzWTe1Y/hmlEUR12/Xq71LkSjxZ5X+aWQvNFuVk4=; b=OS+RMGgA41MgQNIM+rNLe2A16YkL0ELlaZaVmXRCj08YELfxtI1Z+54g3LgwZPbRk9 82bbwiSuUGcwFpWz8932lENJFwIHHR39xFfIIfruTl0E4W31CzS9iWropXJF1AGQx5BN 35sbafOgw+JORd9Bi/hqtEPXE2yTQbT6Ty/zv3n1w4aFXtVtXDpH99/oCa/+Xk+V72U3 Q1RDrOwPoYd4pXHqiN8LNLJpnLe8N/SWt3SZ+MMHHJiiI76M2NQrGzrPUcC1ETHwI4sw 7efwv/kPVVnW/U7PbYEwzeekZVpSkTD2TlQjbAsUK5sqpW0GQnwRMgBHHen21z+XIhTb NhQw== X-Forwarded-Encrypted: i=1; AFNElJ8fpeTpQIaWVEgcIORuaJBaa9ATxulMRNlxvRf2sXP59Qb06PmsUO5LV+bn3p/wiGm0Ps4=@vger.kernel.org X-Gm-Message-State: AOJu0YxkSAfy/BChtL9b/SPXxIDciYR4v7MtIB8tDPWfZNBa4YIu/SWX TE3VEh1GeyTZBVQKzR7JpXIZNzBdEXYHB4FNmPveLTU84pNOibh0PGBfeRFVcTovf84= X-Gm-Gg: Acq92OFjr99dfhkuWcyn23mlWnE6omzj0RSaKUjHzqrFq58xbdVHKDVP/grET7YPphW TXdHUbW+9akmZ4i1A7UYRSOO15AKRGII2g/GEbSZnnS8tdST2mSEljx6EO1maVX4/6nuqcXsqwZ HGVGYyIVnjlodIINPeslBC/WP7bpSOzZ8oZ+lP+ROXWTNpXEm4fIt8c4dH4dezNhsaTorf7wUES OCgnxZHBOFwUr6WALyydC9Jz5MgisHnqqTbZCX/bUQAo/1ccfKtBA2x2kH0auoKQ2eutnRnTUAf WK+HPHIsfJsbCuPOTlICOg74vYVuvMlLHZO0m/GZx99NJdO9OCOpNSoMeruhErn3M0exNXv8jL2 aGQ+fULPc0RDSsn/NNoxXcRZL+KdS12AjMcWN7WF6z87HfMlj8OWbYO+U++nI1uJHZzWOGbPref S8d870gwTe6RGunCB0blWKSzQeQuc50ijujYH5/Cy/3SciV2MFvDaT6UUBgKJkok+w+iuaFpKeU zMu2CtMT/fLTSGDJ/zYFblmg9EjcDV7g8gy59TbWgu5cXYrUWaAjLy4qdWGp1Kj2u5gew== X-Received: by 2002:a05:6000:2888:b0:45d:4c30:81a6 with SMTP id ffacd0b85a97d-45eb30de822mr28814928f8f.5.1779796711490; Tue, 26 May 2026 04:58:31 -0700 (PDT) Received: from ?IPV6:2a00:1028:838d:271e:8e3b:4aff:fe4c:a100? (dynamic-2a00-1028-838d-271e-8e3b-4aff-fe4c-a100.ipv6.o2.cz. [2a00:1028:838d:271e:8e3b:4aff:fe4c:a100]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d4741bsm36462739f8f.22.2026.05.26.04.58.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 May 2026 04:58:31 -0700 (PDT) Message-ID: <885a7940-3fcd-4fc4-b80e-cd82a817defd@suse.com> Date: Tue, 26 May 2026 13:58:29 +0200 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 08/14] module: Move authentication logic into dedicated new file To: =?UTF-8?Q?Thomas_Wei=C3=9Fschuh?= Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Nathan Chancellor , Nicolas Schier , Arnd Bergmann , Luis Chamberlain , 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 , 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 References: <20260505-module-hashes-v5-0-e174a5a49fce@weissschuh.net> <20260505-module-hashes-v5-8-e174a5a49fce@weissschuh.net> Content-Language: en-US From: Petr Pavlu In-Reply-To: <20260505-module-hashes-v5-8-e174a5a49fce@weissschuh.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 5/5/26 11:05 AM, Thomas Weißschuh wrote: > The module authentication functionality will also be used by the > hash-based module authentication. To make it usable even if > CONFIG_MODULE_SIG is disabled, move it to a new file. > > Signed-off-by: Thomas Weißschuh > --- > [...] > diff --git a/kernel/module/auth.c b/kernel/module/auth.c > index 956ac63d9d33..831a13eb0c9b 100644 > --- a/kernel/module/auth.c > +++ b/kernel/module/auth.c > @@ -5,10 +5,16 @@ > * Written by David Howells (dhowells@redhat.com) > */ > > +#include > #include > #include > +#include > #include > +#include > +#include > #include > +#include > +#include "internal.h" > > #undef MODULE_PARAM_PREFIX > #define MODULE_PARAM_PREFIX "module." > @@ -30,3 +36,82 @@ void set_module_sig_enforced(void) > { > sig_enforce = true; > } > + > +static int mod_verify_sig(const void *mod, struct load_info *info) > +{ > + struct module_signature ms; > + size_t sig_len, modlen = info->len; > + int ret; > + > + if (modlen <= sizeof(ms)) > + return -EBADMSG; > + > + memcpy(&ms, mod + (modlen - sizeof(ms)), sizeof(ms)); > + > + ret = mod_check_sig(&ms, modlen, "module"); > + if (ret) > + return ret; > + > + sig_len = be32_to_cpu(ms.sig_len); > + modlen -= sig_len + sizeof(ms); > + info->len = modlen; > + > + return module_sig_check(mod, modlen, mod + modlen, sig_len); > +} > + > +int module_auth_check(struct load_info *info, int flags) > +{ > + int err = -ENODATA; > + const unsigned long markerlen = sizeof(MODULE_SIGNATURE_MARKER) - 1; > + const char *reason; > + const void *mod = info->hdr; > + bool mangled_module = flags & (MODULE_INIT_IGNORE_MODVERSIONS | > + MODULE_INIT_IGNORE_VERMAGIC); > + /* > + * Do not allow mangled modules as a module with version information > + * removed is no longer the module that was signed. > + */ > + if (!mangled_module && > + info->len > markerlen && > + memcmp(mod + info->len - markerlen, MODULE_SIGNATURE_MARKER, markerlen) == 0) { > + /* We truncate the module to discard the signature */ > + info->len -= markerlen; > + err = mod_verify_sig(mod, info); > + if (!err) { > + info->auth_ok = true; > + return 0; > + } > + } > + > + /* > + * We don't permit modules to be loaded into the trusted kernels > + * without a valid signature on them, but if we're not enforcing, > + * certain errors are non-fatal. > + */ > + switch (err) { > + case -ENODATA: > + reason = "unsigned module"; > + break; > + case -ENOPKG: > + reason = "module with unsupported crypto"; > + break; > + case -ENOKEY: > + reason = "module with unavailable key"; > + break; > + > + default: > + /* > + * All other errors are fatal, including lack of memory, > + * unparseable signatures, and signature check failures -- > + * even if signatures aren't required. > + */ > + return err; > + } > + > + if (is_module_sig_enforced()) { > + pr_notice("Loading of %s is rejected\n", reason); > + return -EKEYREJECTED; > + } > + > + return security_locked_down(LOCKDOWN_MODULE_SIGNATURE); > +} The resulting call chain of the module authentication/signature functions is as follows: ima_read_modsig() -----------------------------, v module_auth_check() -> mod_verify_sig() -> mod_check_sig() | |-> module_sig_check() '-> module_hash_check() I think this logic is quite hard to follow because mod_verify_sig(), mod_check_sig() and module_sig_check() have very similar names. The naming of module_auth_check(), module_sig_check() and module_hash_check() looks good to me, but I would prefer to rename mod_check_sig() and mod_verify_sig(). Perhaps mod_check_sig() could be renamed to mod_check_sig_header(), and mod_verify_sig() to mod_dispatch_auth_check()? Otherwise, the patch looks ok to me. Feel free to add: Reviewed-by: Petr Pavlu -- Thanks, Petr