From patchwork Mon Jan 30 14:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_L=C3=BCbbe?= X-Patchwork-Id: 50302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2202480wrn; Mon, 30 Jan 2023 06:17:10 -0800 (PST) X-Google-Smtp-Source: AK7set/Q/vGPhpV2jMshKtk6bCLURm+7ctZ+uLutogxjYUoN2LS0sz9fxZ51cDwIR40m2F1oYvK2 X-Received: by 2002:aa7:9984:0:b0:593:92b3:b757 with SMTP id k4-20020aa79984000000b0059392b3b757mr8628961pfh.3.1675088230069; Mon, 30 Jan 2023 06:17:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675088230; cv=none; d=google.com; s=arc-20160816; b=SoWTJlDF/gfuiL0y66CJMF6VvlrHLsK7DsuVrHFguSqg367TAJmoVuAOeuOh+Mx92I bc/wfaa2HOg4ZkSMA3PZXgKB2Z4FV6L1R3vFV7S3+qFVal/eDoXnuKwKVqS+4MQd/FCm xt4GwMtM9Ai1Fu22RH7mtqCqk6rASGF26bAiPmT+aN7DSYLjSl4c8t7JFeW+tshuduCX +/9U38OT5pnoJuWxDAvYg5sTQUbZY+cfHHoYMMtv4T2N6LYWcNq96U9O/j96DB2Iy+gx I2PNz4EihmwPERiTULBW4SCKKqk+xfR+y9+OZCmpd98Qr6s8gEjLXSAfvRv4zGd3eKgw uz2g== 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; bh=YqB2LARHmnZnjMc/mpFfneNed4UTVdwD+Sogtw4g5cs=; b=ViJFlwCbyE3N3bna2k22p9lOF4mT+KNRY1t4Zwd68L3BXUgjzFTdbxFR/U0HM8cDZj ah+9J5FrU0CG5jKHDFD3Jf+2ZxkpoNO2MHGhOr6jd2hZmZzsR96uEGpWNDud5kI1jKdi u5psQ3dPVImvlYmh23JoIpw8fYHDiTZePf5g0OsQSLAqUEOudCo0fMoMMlgt5RQ6SOcD 4kWrRKcL9D3mZN9kJ9x6HPcrRaRpjjspoRA4JFZEpiKkCXhk4HL9XIsp4EbhwvKf6fPN 0F31hTJwmoayX+Zokz2MRlMSspVI1I253qaS3MQqvRZgpcr9W00vWdSoEgvBFguivYAD Ol/g== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t9-20020a056a00138900b0058e12f778bbsi15483045pfg.308.2023.01.30.06.16.58; Mon, 30 Jan 2023 06:17:10 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237427AbjA3OQp (ORCPT + 99 others); Mon, 30 Jan 2023 09:16:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237393AbjA3OQi (ORCPT ); Mon, 30 Jan 2023 09:16:38 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0842A3C2A7 for ; Mon, 30 Jan 2023 06:16:34 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pMUxI-0004FU-3D; Mon, 30 Jan 2023 15:16:20 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pMUxI-001UGx-DS; Mon, 30 Jan 2023 15:16:19 +0100 Received: from jlu by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pMUxG-00GG5L-TK; Mon, 30 Jan 2023 15:16:18 +0100 From: Jan Luebbe To: Masahiro Yamada Cc: Jan Luebbe , David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 1/2] certs: Fix build error when PKCS#11 URI contains semicolon Date: Mon, 30 Jan 2023 15:15:52 +0100 Message-Id: <20230130141553.3825449-2-jlu@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130141553.3825449-1-jlu@pengutronix.de> References: <20230130141553.3825449-1-jlu@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: jlu@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756457316194786533?= X-GMAIL-MSGID: =?utf-8?q?1756457316194786533?= When CONFIG_MODULE_SIG_KEY is PKCS#11 URI (pkcs11:*) and contains a semicolon, signing_key.x509 fails to build: certs/extract-cert pkcs11:token=foo;object=bar;pin-value=1111 certs/signing_key.x509 Usage: extract-cert Add quotes to the PKCS11_URI variable to avoid splitting by the shell. Fixes: 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf") Signed-off-by: Jan Luebbe --- certs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/certs/Makefile b/certs/Makefile index 9486ed924731..cda21811ed88 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -67,7 +67,7 @@ $(obj)/system_certificates.o: $(obj)/signing_key.x509 PKCS11_URI := $(filter pkcs11:%, $(CONFIG_MODULE_SIG_KEY)) ifdef PKCS11_URI -$(obj)/signing_key.x509: extract-cert-in := $(PKCS11_URI) +$(obj)/signing_key.x509: extract-cert-in := "$(PKCS11_URI)" endif $(obj)/signing_key.x509: $(filter-out $(PKCS11_URI),$(CONFIG_MODULE_SIG_KEY)) $(obj)/extract-cert FORCE From patchwork Mon Jan 30 14:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_L=C3=BCbbe?= X-Patchwork-Id: 50306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2202895wrn; Mon, 30 Jan 2023 06:17:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXu7FJCLtlDVLZ3ZNXGeZ3eVk+4n7ibxdYTryYAgAsPDYPqeVVPd4N7PVWZ4zVUoDDUZwCw+ X-Received: by 2002:a17:902:b484:b0:193:2d53:3fcd with SMTP id y4-20020a170902b48400b001932d533fcdmr46025942plr.17.1675088271698; Mon, 30 Jan 2023 06:17:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675088271; cv=none; d=google.com; s=arc-20160816; b=pHTkWQiBLYv8hy5FsZ0XRFCtwUscy2MCvEdtAt3mxeg9PrewLN47nK4oQgvAtVBbqe 5kYlXgsQQHKCeCgQbmyqHCvlGT8mlnQPrmc/ixacdnirsl3NzYl2Mps1MIQVs57ARYyT lf2bjsj+qpGqDdiCLZ2x7YWpsNAzPgawCMc/nLHlrlBouTODhWPewyfZSexbQ9ePxGb+ GqOsec8tibFrTXG5DPLWWSOjbvoHjJq8Dt2KOrNfmHiEB28neThE839lDZlw722LUt1X WwkZKj96lKnQTEgod/qQkXQRHD2lA0j9DVK/tTB/i1u31TofNk8XcZRfgfRRoiz8W0Bl iR5A== 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; bh=yMO5yfR3nQuW5MVYptBHE6c4hVdEkNOV61mau/cnGMo=; b=iUK8ZfMSOSzBxPQwzec3fmI6/6Oe5SE5JPsbCwRpq/yCi3rxkIv/Nxt3NkKheMXIq1 ZUWdmi0c9isK7Mi7jxh72qHNgrq6K9WEvUc82cgc88Ga06rTw/1DSgj/jO+UW+D7B+su R40Ba7wFKhUv5KGFJO+WVCIxtNZlXiqGAfIcVU38A2wNRIJYSXSWg51SMnwgLUDs1gGF +sKl3qjFdFQzRAQuv79zy2JZbNDDMERPTolVpt6kR+fiJ4CZPKdyfCd8DQRjgjIJNYkr Xv0mm+EHbALSRskCNqH7Ofsgw8WsM3oK03JY2R/L8wivKORtYL21I/StovNRW2j7ppUV 8XyQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x19-20020a63b213000000b004c7f099f294si12793887pge.456.2023.01.30.06.17.38; Mon, 30 Jan 2023 06:17:51 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237474AbjA3ORV (ORCPT + 99 others); Mon, 30 Jan 2023 09:17:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237468AbjA3OQ4 (ORCPT ); Mon, 30 Jan 2023 09:16:56 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAE643D0AF for ; Mon, 30 Jan 2023 06:16:50 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pMUxK-0004J8-RE; Mon, 30 Jan 2023 15:16:22 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pMUxL-001UH2-3R; Mon, 30 Jan 2023 15:16:22 +0100 Received: from jlu by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pMUxJ-00GHv4-Bp; Mon, 30 Jan 2023 15:16:21 +0100 From: Jan Luebbe To: Masahiro Yamada Cc: Jan Luebbe , David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 2/2] kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI Date: Mon, 30 Jan 2023 15:15:53 +0100 Message-Id: <20230130141553.3825449-3-jlu@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130141553.3825449-1-jlu@pengutronix.de> References: <20230130141553.3825449-1-jlu@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: jlu@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756457359330210426?= X-GMAIL-MSGID: =?utf-8?q?1756457359330210426?= When CONFIG_MODULE_SIG_KEY is PKCS#11 URI (pkcs11:*), signing of modules fails: scripts/sign-file sha256 /.../linux/pkcs11:token=foo;object=bar;pin-value=1111 certs/signing_key.x509 /.../kernel/crypto/tcrypt.ko Usage: scripts/sign-file [-dp] [] scripts/sign-file -s [] First, we need to avoid adding the $(srctree)/ prefix to the URL. Second, since the kconfig string values no longer include quotes, we need to add them again when passing a PKCS#11 URI to sign-file. This avoids splitting by the shell if the URI contains semicolons. Fixes: 4db9c2e3d055 ("kbuild: stop using config_filename in scripts/Makefile.modsign") Fixes: 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf") Signed-off-by: Jan Luebbe --- scripts/Makefile.modinst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 836391e5d209..4815a8e32227 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -66,9 +66,13 @@ endif # 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 +sig-key := $(CONFIG_MODULE_SIG_KEY) +endif quiet_cmd_sign = SIGN $@ - cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(sig-key) certs/signing_key.x509 $@ \ + cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) "$(sig-key)" certs/signing_key.x509 $@ \ $(if $(KBUILD_EXTMOD),|| true) else quiet_cmd_sign :=