From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 758A53F786E for ; Tue, 26 May 2026 11:58:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779796720; cv=none; b=hvoIu8LiZ5Xrnwo8F2rIeNd+QAjqixwFzAfu9c6tjf0l05/kuXJTD/HNSzoZVH9W08QoLaNTmurq/NwUcwE7O+RcNNA8i12UGPvWaBg+w+eJTgytM0rDKKMmw4El4rXFWSYA0FafaRzrOgpL3RILPADw5Bk6eojQBa299c1AZsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779796720; c=relaxed/simple; bh=5W28sDVkarRvqQjMAW82poEsdm8er4gFoT6JmY4x6m0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=luBH7CQvYa7s6Y8Zb1Fg6RJWvMjc8WUR7XdRTj9AnYmDmddFYhL49/VIs10skpFlcbW8tSDaGJFhsiRk0rHtTsbStmZ7KZ7KtzMkfkbjJdr/Q4KveU9SedftNeMExjPhVM+FyB7oW2z1DqshwyZnVOmVPrDs13XwLFhYQSlNEEk= 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.52 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-f52.google.com with SMTP id ffacd0b85a97d-441209fb77eso6498755f8f.1 for ; Tue, 26 May 2026 04:58:35 -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=QCvH53IxyGFFPe2z1dwVpMHDBKyQOe/Qky8iA8lyF7KFqoxGcB6OC2QChztARlt/+i xDZbqtz4V/6vVw/K8oq221jZ8+/Y91OY7ExrUSzKFyCoRwj1LNywa58OCE9pRQ/R2snI F0xh04QfQT/YY9uurFYstc+7J+7TkejjR0ABAAWg+7SUJt66ylwJs5hyTJ/HLIkh2zgO jaf/oA6TznOkTzNmMmmcsVm/xyhW0Np/ZeHghzvzDrSYfe6KIaCYNJ8Q0PJak9MiMeaR OAuMuPwePt5QVbcNcMF1CJpD++NOkXwC4DrLY8kV2Gmpsom8iABfR9St5JIpR2ASp9ol Nehg== X-Forwarded-Encrypted: i=1; AFNElJ8cOiO4p27Gsph1qmEVUJdswrq4FUduuwF7F3MeECONxEajaosQ3zYRslm3Q2tRURa3Dcl4kPuH8aZVuRh8@vger.kernel.org X-Gm-Message-State: AOJu0YyzZAgn6wJ/AccLoDWb46KkKEoBLrZpBvStUtt0dJuLXv6FbEDg q0sNjgoQjtHJyUMzUJkegjvbYiZrdW2R/XYSXZV6+P3qfA0TyBsnrhVZ6NGUaHIEzLQ= X-Gm-Gg: Acq92OEQZaziO9VYh3wR9mktWNhpKh6LC/MhUPTOCQvbrAJen/HmtxlOf7NfdcBIVdW j/enMSal09i0qlv0iDcs6eNgaJkexnD4DF4ZSB/w80Xpp2EeUemgC8VvOddY73Kn4w3qhf2Jyjk UB3F5+Yxtg+3SPIXqMNnAu/5ZEBmP46xnGe0UoRAzCH3vXIzp1TvgFtSDimEeM3BpYdgOIu7Htu yjCB9LiBmL8lsdKPXumX+5pbqSyBppiMxj43X38vkmadwfJ1OKjpxcXIrR+IG5XmMtgZya7Huww Rdntsjt23Uj6qRM2a7MGxBRJIf60V99o4hYrSmtO0x46mKN9YjeMYuSZMe/0Sq6zq+YiU2PUXAT GYnotcoQOoNvaq/e0pKM/txkJtHR0z+SyF0g7130kkwuYGqhADMDcND1rrg4VNtHnDlUi4iRn+t /M8rpHX4UXdOQrvtTbwI14V/5QZW4Qvj13yxzyOuLgom1G3Jen8zS4egDAW9Cu+gyqxA29ztzFi J17QzdY2UTTiq+drpH+N3u4L3H5CakYIj31HK0NOMnDp99RJBEvvz4GPEY4sp1oJxOe9g== 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: linux-modules@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