From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5CCA158094 for ; Thu, 23 Jun 2022 12:51:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44D18E0809; Thu, 23 Jun 2022 12:51:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC785E07B3 for ; Thu, 23 Jun 2022 12:51:41 +0000 (UTC) Message-ID: <2de980d1-688f-c90b-c178-0b3a58f04099@gentoo.org> Date: Thu, 23 Jun 2022 08:51:37 -0400 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [gentoo-dev] [PATCH] linux-mod.eclass: support module signing Content-Language: en-US To: gentoo-dev@lists.gentoo.org References: <20220621181959.920941-1-concord@gentoo.org> <20220621182158.qo57sqqn6gcgdzry@fuuko> From: Mike Pagano In-Reply-To: <20220621182158.qo57sqqn6gcgdzry@fuuko> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Archives-Salt: 90a67eff-fb75-46c4-8d67-6fb049c8b9b3 X-Archives-Hash: 1f30c834364bcf1219be4b870a546845 On 6/21/22 14:21, Kenton Groombridge wrote: > On 22/06/21 02:19PM, Kenton Groombridge wrote: >> eee74b9fca1 adds support for module compression, but this breaks loading >> out of tree modules when module signing is enforced because modules must >> be signed before they are compressed. Additionally, the recommended >> Portage hook[1] no longer works with this change. >> > > Forgot to include this reference: > > [1] https://wiki.gentoo.org/wiki/Signed_kernel_module_support#Automatically_signing_kernel_modules_.28Portage.29 > >> Add module signing support in linux-mod.eclass which more or less does >> exactly what the aforementioned Portage hook does. If the kernel >> configuration has CONFIG_MODULE_SIG_ALL=y, then read the hash and keys >> from the kernel configuration and call the sign_file tool to sign the >> module before it is compressed. >> >> Bug: https://bugs.gentoo.org/show_bug.cgi?id=447352 >> Signed-off-by: Kenton Groombridge >> --- >> eclass/linux-mod.eclass | 16 ++++++++++++++++ >> 1 file changed, 16 insertions(+) >> >> diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass >> index b7c13cbf7e7..fd40f6d7c6c 100644 >> --- a/eclass/linux-mod.eclass >> +++ b/eclass/linux-mod.eclass >> @@ -712,6 +712,22 @@ linux-mod_src_install() { >> cd "${objdir}" || die "${objdir} does not exist" >> insinto "${INSTALL_MOD_PATH}"/lib/modules/${KV_FULL}/${libdir} >> >> + # check here for CONFIG_MODULE_SIG_ALL and sign the module being built if enabled. >> + # modules must be signed before they are compressed. >> + >> + if linux_chkconfig_present MODULE_SIG_ALL; then >> + local module_sig_hash="$(linux_chkconfig_string MODULE_SIG_HASH)" >> + local module_sig_key="$(linux_chkconfig_string MODULE_SIG_KEY)" >> + module_sig_key="${module_sig_key:-certs/signing_key.pem}" >> + if [[ "${module_sig_key#pkcs11:}" == "${module_sig_key}" && "${module_sig_key#/}" == "${module_sig_key}" ]]; then >> + local key_path="${KERNEL_DIR}/${module_sig_key}" >> + else >> + local key_path="${module_sig_key}" >> + fi >> + local cert_path="${KERNEL_DIR}/certs/signing_key.x509" >> + "${KERNEL_DIR}"/scripts/sign-file ${module_sig_hash//\"} ${key_path//\"} ${cert_path} ${modulename}.${KV_OBJ} >> + fi >> + >> # check here for CONFIG_MODULE_COMPRESS_ (NONE, GZIP, XZ, ZSTD) >> # and similarily compress the module being built if != NONE. >> >> -- >> 2.35.1 >> >> First of all, thank-you for your work ! I appreciate any assistance with enhancement or clean-up of these eclasses. I tested your patch, are you signing the files in 'work' after they are installed in 'image' ? /usr/src/linux/scripts/extract-module-sig.pl -s ./work/kernel/nvidia.ko > /tmp/sig Read 47802433 bytes from module file Found magic number at 47802433 Found PKCS#7/CMS encapsulation Found 681 bytes of signature [308202a506092a864886f70d010702a0] /usr/src/linux/scripts/extract-module-sig.pl -s ./image/lib/modules/5.18.6-gentoo/video/nvidia.ko > /tmp/sig Read 47227784 bytes from module file Magic number not found at 47227784 Mike -- Mike Pagano Gentoo Developer - Kernel Project Gentoo Sources - Lead E-Mail : mpagano@gentoo.org GnuPG FP : 52CC A0B0 F631 0B17 0142 F83F 92A6 DBEC 81F2 B137 Public Key : http://http://pgp.mit.edu/pks/lookup?search=0x92A6DBEC81F2B137&op=index