From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B00DC433EF for ; Thu, 14 Apr 2022 01:46:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cms1l4ia3aGIiaoegAHAhxXZfno8oKsDUB/0zGUhczo=; b=drJd2Ds2Yq2hT4kUFcEim9jeaU ZD7eAVa6D4O9Q4U5zTDqcmmfTQO1k68OuIHNPk9D2Nd84bPN2GB77YSlLIst8c7QCQILKcKopgUSd Zn0PRr8QanCoReNRTqT5vXjanF1jnoBhXrEd7HwKYwNsCVpvrR2qK05ngYIBnqLYF5V8tovJAUwcq 0v/WO6GHvRHyU+Ewm++UZ3xylGbMBKjvO3CWiGN1EQq5fbDYbBcPx5G4gJUnX6ymHpPo/ream8U5u oC/vzqeoQvAZy+7lLv3zG6pTnUpgtshA+w4k48ctN4Ka8Kos9l0oeaB39ZWLagnrgQthEXG2NRk8w l+LWLgeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1neoXb-003JDT-R1; Thu, 14 Apr 2022 01:45:00 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1neoXA-003Iz9-DB for linux-arm-kernel@lists.infradead.org; Thu, 14 Apr 2022 01:44:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649900671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jXalVENl364WLU242Jde+1X/Q2QKLGjlQWD5km644gM=; b=dHkS40RNFUzOrPrb7w93W/sr/DkTsTDKocCkA+naT5lWAuFlcrDg3uVUBz2HB77CZjAekG YDfVJSYeqTZQN3Gtt0YtSGsxzqh/I1FpiTwLf6SUt7NUuMYh1llxaAk8Ii9zziRt5B0Oe5 QwC0DvKyV8Tj06KnkXVLJnvavkjt+Kw= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-403-Nw91T5wqM7WUOvK15FFHnw-1; Wed, 13 Apr 2022 21:44:28 -0400 X-MC-Unique: Nw91T5wqM7WUOvK15FFHnw-1 Received: by mail-pj1-f72.google.com with SMTP id d11-20020a17090a628b00b001ca8fc92b9eso2042827pjj.9 for ; Wed, 13 Apr 2022 18:44:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jXalVENl364WLU242Jde+1X/Q2QKLGjlQWD5km644gM=; b=qFZlojVH50DxveowOBUYnv/Oy5hqq5ncxaLTlNIMiryWXHCc0dGExZSe0Pe26b4qws aITMN3l1JbSBORxLUTySjwZiTJ3lc5x346lhu42dbw+TnMCkEAoTXSSHP7YMlFMMZwGe pEtWAHIPcd5CUj8WCwVc2xMBSyqW9Gj5HZvvpRevdh1nZK+cfp3DXIzXWGV3jpjMSAzS WTH3Ec5pKR8T7mpBOPrzDY7q5TlWedgIYcPN6vflIoGbl+hZBBDQFBkkDHs+4wbGSqTt XSbfn3msDA8+FMqcSyzLJs6dYfoSjrtxFHaN490V9uL0KYjSbZ9rJM8PrfOkemvdk/xy yGgQ== X-Gm-Message-State: AOAM5331scVXcnydz67xojYMXl5Z1Z3GMoBTVjPImUAhjJzqkXeukApJ jlmeDP8Hv1Fa87sFbrkh5Jw0Mx2mNYDXxo3v52HtaAzYak5o4v8dQ+kNw545yityyuiYxYwHvZl 6xEytmHACttmj6ktln5lGFoSzmdAPuRmF5ME= X-Received: by 2002:a17:90a:1d0e:b0:1cb:50ec:27f with SMTP id c14-20020a17090a1d0e00b001cb50ec027fmr1691270pjd.195.1649900667480; Wed, 13 Apr 2022 18:44:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7lvJcRtRvT6UTIGdqLIQ5fotL6BdwS5zyMoazeF5Hq+0VgXvKq4yRZVC76yYSbM5z2e4jXA== X-Received: by 2002:a17:90a:1d0e:b0:1cb:50ec:27f with SMTP id c14-20020a17090a1d0e00b001cb50ec027fmr1691236pjd.195.1649900667213; Wed, 13 Apr 2022 18:44:27 -0700 (PDT) Received: from localhost ([240e:3a1:31c:360:52fc:c968:cb41:efbc]) by smtp.gmail.com with ESMTPSA id k25-20020aa790d9000000b00508232aecedsm332618pfk.67.2022.04.13.18.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 18:44:26 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, Michal Suchanek , Baoquan He , Dave Young , Will Deacon , "Eric W . Biederman" , Mimi Zohar , Chun-Yi Lee , Philipp Rudo , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, stable@kernel.org, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Martin Schwidefsky , linux-s390@vger.kernel.org (open list:S390), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 4/4] kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification Date: Thu, 14 Apr 2022 09:43:44 +0800 Message-Id: <20220414014344.228523-5-coxu@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220414014344.228523-1-coxu@redhat.com> References: <20220414014344.228523-1-coxu@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=coxu@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220413_184432_532319_531CBA4F X-CRM114-Status: GOOD ( 12.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6300058428903378334==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============6300058428903378334== Content-Transfer-Encoding: 8bit Content-Type: application/octet-stream; x-default=true From: Michal Suchanek commit e23a8020ce4e ("s390/kexec_file: Signature verification prototype") adds support for KEXEC_SIG verification with keys from platform keyring but the built-in keys and secondary keyring are not used. Add support for the built-in keys and secondary keyring as x86 does. Fixes: e23a8020ce4e ("s390/kexec_file: Signature verification prototype") Cc: Philipp Rudo Cc: kexec@lists.infradead.org Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Cc: stable@kernel.org Signed-off-by: Michal Suchanek Reviewed-by: "Lee, Chun-Yi" Signed-off-by: Coiby Xu --- arch/s390/kernel/machine_kexec_file.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c index 8f43575a4dd3..fc6d5f58debe 100644 --- a/arch/s390/kernel/machine_kexec_file.c +++ b/arch/s390/kernel/machine_kexec_file.c @@ -31,6 +31,7 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1; struct module_signature *ms; unsigned long sig_len; + int ret; /* Skip signature verification when not secure IPLed. */ if (!ipl_secure_flag) @@ -65,11 +66,18 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) return -EBADMSG; } - return verify_pkcs7_signature(kernel, kernel_len, - kernel + kernel_len, sig_len, - VERIFY_USE_PLATFORM_KEYRING, - VERIFYING_MODULE_SIGNATURE, - NULL, NULL); + ret = verify_pkcs7_signature(kernel, kernel_len, + kernel + kernel_len, sig_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) + ret = verify_pkcs7_signature(kernel, kernel_len, + kernel + kernel_len, sig_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + return ret; } #endif /* CONFIG_KEXEC_SIG */ -- 2.34.1 --===============6300058428903378334== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============6300058428903378334==--