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 1D167C433F5 for ; Fri, 4 Mar 2022 02:05:29 +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-Transfer-Encoding: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-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2KfQXXr0id6eBPEhpJlQi7PQWvnvh4rnHdxV24CNyQ0=; b=2FKhuftMp5/s/8 5ogXRiwl8gW5F951rVcjlKCq6qF7aBOIpDWrwNfxBsIke34ogwMntSQgBgG6v6FRxGbusue+xASi3 SbdTms+/+wX636zBlcdld0fooYcQiyjjEiL+W/4dMNall3aZvhNtvngwbQ/V3dryy8C3xPXrWimnn eLLVSag4zovwbTqkHyCvgLVMJQlnrYK2Hvum0mNMSoOiuZPD2NJ1n0S9NSre++hE4XnF3QXMzOet/ x44DLDvd+AVFNLNu4RDCBQegrYUTXmlJ1FrolJxqN4pNkqlSz6vahIs6annbk6MwrRG8vU6hlUWDA +sNMA0Skb4RomuxnJZ1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPxIr-008HHG-JA; Fri, 04 Mar 2022 02:04:21 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPxIc-008HBr-5K; Fri, 04 Mar 2022 02:04:07 +0000 Received: by mail-pj1-x102c.google.com with SMTP id cx5so6204368pjb.1; Thu, 03 Mar 2022 18:04:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CR9vVQihO0qFKWqSweZPx72Hjt/E+k2ox1hfnK+ogp0=; b=cgLPjke7bu5oyIi7lbn+OjmutdOS1VUnCwZ5gwH7XEBiQ0GdlEzLV8/QrxzQj8CEbe nZg5qbsJwb2glpdX6QV6/E1IGrvM+y1Z+vr64WVuTPsFeqGTa+pl5h7qlbfoj1k3vKGN GuvbiHfBEAhpA/1MaTEzg22PCVY3QQKZfFCWpcqa1azcMOCT38ovDEEuVeUk6/bqZ2nP fDJaBcjReCZ3j4mGpN0ksN2++V9Vcx1XYWBJ65CCTgxJCEV3uKHnFBcfNY3cigqXYg/K qUFouNu/+XbAxygUYsUPdq4eBbs8zMO+5VjXfZILsweupRMJGZsq4Klw7j8Rwng7IkK4 Egxg== 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=CR9vVQihO0qFKWqSweZPx72Hjt/E+k2ox1hfnK+ogp0=; b=gzlgRTUDxvzJoPm+FDpHRl1tlyZSV/P3S3LxHaUjgTbPh9+2BdzN35daEEDvrmrNH7 7cAKpHDc0O0lS6vuuKLpFdCVkyvW0V0TK3FLVHbkksOHSnavDt3moXe2uDyxOcIGqG2L h83joG3YNDPfBnbhk5HZxw/s4NgHP5clEyDevptFWTrv71lA3CiX/UUR0xCX9NlBlcoK eGl/xzHDtBTfZ/L68zKcLVKLX6nZlBmmash7psBDcp6AJknDiyfbBV2oe/8JmMoxkl3N RsoC7fs7Pywxn09LKSM85oNyKYcykNrWt9FGDdBSBD4XWqSCVEShTK2K0ZP9oSf1zbB6 rfgw== X-Gm-Message-State: AOAM530fNoy1sQpaTPJRbYDP2rAecXueyEnnxqtlNoOm/ogDNDcdkciw TLSn3B/6QglViTqK29AzXzvLu4d62rAvzRRA X-Google-Smtp-Source: ABdhPJxgfLEyWYjWENib2qUy9Pi2Gp1sRCl5X5eLYmJEdlFUtiREskTMqGyie1xArvk1epTlPb1uYA== X-Received: by 2002:a17:903:2285:b0:151:ae75:21c6 with SMTP id b5-20020a170903228500b00151ae7521c6mr4400927plh.32.1646359445426; Thu, 03 Mar 2022 18:04:05 -0800 (PST) Received: from localhost ([240e:3a1:2e5:800:f995:6136:f760:a3d0]) by smtp.gmail.com with ESMTPSA id 67-20020a630846000000b00372782a65d0sm3337201pgi.60.2022.03.03.18.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 18:04:04 -0800 (PST) From: Coiby Xu To: kexec@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, Baoquan He , Dave Young , Will Deacon , "Eric W . Biederman" , Coiby Xu , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [RESEND PATCH v3 2/3] kexec, KEYS: make the code in bzImage64_verify_sig generic Date: Fri, 4 Mar 2022 10:03:40 +0800 Message-Id: <20220304020341.85583-3-coiby.xu@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220304020341.85583-1-coiby.xu@gmail.com> References: <20220304020341.85583-1-coiby.xu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220303_180406_234860_2DF1C6A7 X-CRM114-Status: GOOD ( 13.16 ) 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Coiby Xu The code in bzImage64_verify_sig could make use of system keyrings including .buitin_trusted_keys, .secondary_trusted_keys and .platform keyring to verify signed kernel image as PE file. Make it generic so both x86_64 and arm64 can use it. Signed-off-by: Coiby Xu --- arch/x86/kernel/kexec-bzimage64.c | 13 +------------ include/linux/kexec.h | 7 +++++++ kernel/kexec_file.c | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 170d0fd68b1f..f73aab3fde33 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -531,17 +530,7 @@ static int bzImage64_cleanup(void *loader_data) #ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) { - int ret; - - ret = verify_pefile_signature(kernel, kernel_len, - VERIFY_USE_SECONDARY_KEYRING, - VERIFYING_KEXEC_PE_SIGNATURE); - if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { - ret = verify_pefile_signature(kernel, kernel_len, - VERIFY_USE_PLATFORM_KEYRING, - VERIFYING_KEXEC_PE_SIGNATURE); - } - return ret; + return kexec_kernel_verify_pe_sig(kernel, kernel_len); } #endif diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 755fed183224..2fe39e946988 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -19,6 +19,7 @@ #include #include +#include #ifdef CONFIG_KEXEC_CORE #include @@ -196,6 +197,12 @@ int arch_kexec_apply_relocations(struct purgatory_info *pi, const Elf_Shdr *relsec, const Elf_Shdr *symtab); int arch_kimage_file_post_load_cleanup(struct kimage *image); +#ifdef CONFIG_KEXEC_SIG +#ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION +int kexec_kernel_verify_pe_sig(const char *kernel, + unsigned long kernel_len); +#endif +#endif int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf); extern int kexec_add_buffer(struct kexec_buf *kbuf); diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 3720435807eb..754885b96aab 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -165,6 +165,23 @@ void kimage_file_post_load_cleanup(struct kimage *image) } #ifdef CONFIG_KEXEC_SIG +#ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION +int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len) +{ + int ret; + + ret = verify_pefile_signature(kernel, kernel_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_KEXEC_PE_SIGNATURE); + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { + ret = verify_pefile_signature(kernel, kernel_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_KEXEC_PE_SIGNATURE); + } + return ret; +} +#endif + static int kexec_image_verify_sig(struct kimage *image, void *buf, unsigned long buf_len) { -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel