From patchwork Wed Aug 23 11:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136755 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp870497vqm; Wed, 23 Aug 2023 20:56:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVJwU7S16p/5xBER306X983yfsiUWPoskZO3aQBpty5yEHKDRNBWkHYfXsA7TZwFZcC4nk X-Received: by 2002:a2e:854c:0:b0:2b5:9d2a:ab51 with SMTP id u12-20020a2e854c000000b002b59d2aab51mr10611963ljj.5.1692849399759; Wed, 23 Aug 2023 20:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692849399; cv=none; d=google.com; s=arc-20160816; b=Vunn8EzuYz0bCPOvkYoCSV6fdpLgHisAXsxMHx9aIE411BGN18O/LBdL0VZz36isMf vhX9JRjPbRYISSH44oS36JR7TzUIJexnfP9UkTbZVp4mi4spG/KjhuJEEUuRIIJ1ckBo N3cv2Ly7kZ8xoXHQNMjIn0xlxypUEK5EM0Ensvc6U/maKES1Lym7kPnmC79BizTwMX/J vvwp4ecLQRMQRiYsWR8V3/PjzNmnD+u48d9BwXezXJz7pPYmWLso203tupchnKSJfHqw keDgwZcblx5bb5bAmeNHozgbm7oce74LBe7RR7ZitM7oUU7695+svmz5AqqemIjGE01H 0Okw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5fpOPCinbFIGC2v2q+ScBKig0M1Fvd7t32L4f+eLcLU=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=uzF56LolIt5beRB6S9ipkBggP3tjt855M95QYOa2e+wg+AcEGXXKBJjlFh17UE5UKY 2b7ccyt+REpIqTenGL/t1KrGWmF8pZBCcEyJ86SKZfLWH6h8CQh8CUvdyoE3uYnVTQge uDhAcDFTNS8bvqmWbrUQLiUhbsuNrJ//LjVH+2XydPAaIJVhe9WPuVmrUsSH6v2/x/ZY bS+a4eOQQKER8iPKUfQOG5dwiWw1gBkpil8o/PT6BD670YDrb70RCP2wbAl4LGVQJb/x zmJOer82vcu+MPZ3Y55W/yij26Iom+C18iL0KEa1M4qD2MfEzelJ8be1hB+SAgH7AfvT 5qLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=u55izHtN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ss4-20020a170907038400b0099b9df9a864si9657583ejb.738.2023.08.23.20.56.27; Wed, 23 Aug 2023 20:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=u55izHtN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234583AbjHWLvX (ORCPT + 49 others); Wed, 23 Aug 2023 07:51:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234573AbjHWLvV (ORCPT ); Wed, 23 Aug 2023 07:51:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E00110D8; Wed, 23 Aug 2023 04:51:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (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 dfw.source.kernel.org (Postfix) with ESMTPS id CC9F165EE5; Wed, 23 Aug 2023 11:51:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE280C433BC; Wed, 23 Aug 2023 11:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692791467; bh=ppMUv0qLwsFmCUlGZJ1h69t/Ezpj7sAWUVh2xcrRGhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u55izHtNM83xo+KNviVMW6hJuLR0ipOxmL++Qw726xia7DnlmR+IhknA1t8iHR7lp AS2P762LWUcvgSqANgDl3aUFiD2vrTMQfQ+cgN7dtr8Pnmti10l7IpYsHH+JnX+fAy 0Q7xhCfyaW6Jwxj4HCYLOkci6MepfljpcUVPDWvianMj0ISgPG8alH9TZeeF16R0Ee I9H3/QjGxEXfpf4v5THgyvp8e0wrhGR4a9rWgg6KN0qr4W047kVUm9Iqi5ZOsW6IHi PCoUE3vrH/WDgrsNwGgH57lENYZBT32rcW+JPBosHMjXSgyO8rsXKJsfnapylA6dLC PVzdu1wvZ28kQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 7/8] kbuild: support 'make modules_sign' with CONFIG_MODULE_SIG_ALL=n Date: Wed, 23 Aug 2023 20:50:47 +0900 Message-Id: <20230823115048.823011-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230823115048.823011-1-masahiroy@kernel.org> References: <20230823115048.823011-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775081251843340395 X-GMAIL-MSGID: 1775081251843340395 Commit d890f510c8e4 ("MODSIGN: Add modules_sign make target") introduced 'make modules_sign' to manually sign modules. Some time later, commit d9d8d7ed498e ("MODSIGN: Add option to not sign modules during modules_install") introduced CONFIG_MODULE_SIG_ALL. If it was disabled, mod_sign_cmd was set to no-op ('true' command). It affected not only 'make modules_install' but also 'make modules_sign'. With CONFIG_MODULE_SIG_ALL=n, 'make modules_install' did not sign modules and 'make modules_sign' could not sign modules either. Kbuild has kept that behavior, and nobody has complained about it, but I think it is weird. CONFIG_MODULE_SIG_ALL=n should turn off signing only for modules_install. If users want to sign modules manually, they should be allowed to use 'make modules_sign'. Signed-off-by: Masahiro Yamada --- scripts/Makefile.modinst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index dc7c54669082..33d424a3f265 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -106,7 +106,6 @@ endif # Signing # Don't stop modules_install even if we can't sign external modules. # -ifeq ($(CONFIG_MODULE_SIG_ALL),y) ifeq ($(filter pkcs11:%, $(CONFIG_MODULE_SIG_KEY)),) sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(srctree)/)$(CONFIG_MODULE_SIG_KEY) else @@ -115,13 +114,15 @@ endif quiet_cmd_sign = SIGN $@ cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) "$(sig-key)" certs/signing_key.x509 $@ \ $(if $(KBUILD_EXTMOD),|| true) -else + +ifeq ($(modules_sign_only),) + +# During modules_install, modules are signed only when CONFIG_MODULE_SIG_ALL=y. +ifndef CONFIG_MODULE_SIG_ALL quiet_cmd_sign := cmd_sign := : endif -ifeq ($(modules_sign_only),) - $(dst)/%.ko: $(extmod_prefix)%.ko FORCE $(call cmd,install) $(call cmd,strip)