From patchwork Thu Apr 14 01:43:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12812832 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2C06C433F5 for ; Thu, 14 Apr 2022 01:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239497AbiDNBq7 (ORCPT ); Wed, 13 Apr 2022 21:46:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239499AbiDNBqy (ORCPT ); Wed, 13 Apr 2022 21:46:54 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CF82E60F8 for ; Wed, 13 Apr 2022 18:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649900669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jXalVENl364WLU242Jde+1X/Q2QKLGjlQWD5km644gM=; b=AHRXrJCzY4a9Aq5Rvukqu3UAw0QubNs94NjLCZuD7ZXJpKrcSDk5c9CKEzRbNIqtHEHMdD GltDKQy9OIq8TyzcTjPxFLTNOgOkopBXzsw/S7Pxhkzw2r2+xVSCElaZzNQBz+UXQZvDWn FEHQ6l5Ah+68MxlSVUH9SAgcFx5il2c= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-403-Farg2mRUOZSbErA-tg1oew-1; Wed, 13 Apr 2022 21:44:28 -0400 X-MC-Unique: Farg2mRUOZSbErA-tg1oew-1 Received: by mail-pl1-f197.google.com with SMTP id u5-20020a170902b28500b00158a978a3a8so1338811plr.19 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=sHH1jXZ5hWK+UAuGh4xaxxtAgBKWCIeMhBxIMGN43BWaA9mX/JBu8EIt38PRutcQwL PDNv03whCIbYaeXUQtfFsgaB/3yoCs9PoQRs3dIITSLGLMLZmYY7xbjD1gIhVBtwACUU afOuQBAvTxFk7ogHR6p1rdeVQwz/dLOWrrWN+meFleGyFi1fkPNVEj/QYnYOOAWHbH+T DlhKq6TTcn03JNsdeGrS1tiSSCy4mOtfZ62w8HULD6UFHyFUs3y8bEiSME2ZzYgwJZgc 2fz88qe6+gVXm/mNGB7fiEg5vzfrwlh8jYkt8pZSXy7xrM9ae+jFW6xAsnaoLDtJY31i xvOg== X-Gm-Message-State: AOAM531b9BR19r/gVcxtexdVG8vCLykAa7sEZucOG/PBB8jMnc3l5NFE 60OdxHPNP+y/UvK+WbxdVBEXkqadjtFghGB8DFnuU+lJxyc7vyx7idsqJ3UAzoNURqDePunAXTf OmDXiCglwvWj0zMUkSMA= X-Received: by 2002:a17:90a:1d0e:b0:1cb:50ec:27f with SMTP id c14-20020a17090a1d0e00b001cb50ec027fmr1691255pjd.195.1649900667466; 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 Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org 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 Acked-by: Baoquan He --- 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 */