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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 885E6C433FE for ; Wed, 29 Sep 2021 16:24:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A444613DA for ; Wed, 29 Sep 2021 16:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345721AbhI2Q0R (ORCPT ); Wed, 29 Sep 2021 12:26:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:33664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345534AbhI2Q0O (ORCPT ); Wed, 29 Sep 2021 12:26:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 36D3461440; Wed, 29 Sep 2021 16:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632932673; bh=w4VJ0cTrcVdnFPOz099Y8UG/uO+ZbS2A3UhOj01R4SI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=boVv8N2dksnZXdTCWUBJUd4AG5QEJsKyjisvpIIvRYNyjyxLOHvLxSS4ZoSFOQB/D G+tWMSoaQCgfJ5BABvIP8m6wvc5R/+MTW7PmuM0otR9fKnh1ij6wgXbOCtwWFND66b EEwc2vo5okag4C6ZXEbv+6o+1AJ05Y/kmkTqR9mjFX/RzRGoSamKwWFr3E6ifpgHcH jY0yzP+ZkMWorb2JjcyaBIHVjt+lR+f7D2chVjxfPnLBHWIOF3OHzB2uKPstckMJPA FFl9E0tG2kaHzFoHFVSSsO5Cbfvjzedc17Bu29DLiCMIzZ2R9gOtXankzvRY91cK/3 R2/C4U1t20AGw== Date: Wed, 29 Sep 2021 17:24:28 +0100 From: Will Deacon To: Coiby Xu Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Coiby Xu , Catalin Marinas , open list Subject: Re: [PATCH 2/2] arm64: kexec_file: use more system keyrings to verify kernel image signature Message-ID: <20210929162428.GG22029@willie-the-truck> References: <20210927005004.36367-1-coiby.xu@gmail.com> <20210927005004.36367-3-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210927005004.36367-3-coiby.xu@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 27, 2021 at 08:50:04AM +0800, Coiby Xu wrote: > From: Coiby Xu > > This allows to verify arm64 kernel image signature using not only > .builtin_trusted_keys but also .secondary_trusted_keys and .platform keyring. > > Signed-off-by: Coiby Xu > --- > arch/arm64/kernel/kexec_image.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c > index 9ec34690e255..2357ee2f229a 100644 > --- a/arch/arm64/kernel/kexec_image.c > +++ b/arch/arm64/kernel/kexec_image.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -133,8 +132,7 @@ static void *image_load(struct kimage *image, > #ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG > static int image_verify_sig(const char *kernel, unsigned long kernel_len) > { > - return verify_pefile_signature(kernel, kernel_len, NULL, > - VERIFYING_KEXEC_PE_SIGNATURE); > + return arch_kexec_kernel_verify_pe_sig(kernel, kernel_len); I'm fine with this in principle, but it looks like the first patch is the important one. So for the arm64 bit: Acked-by: Will Deacon Will 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65559C433F5 for ; Wed, 29 Sep 2021 16:26:31 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2EDE861452 for ; Wed, 29 Sep 2021 16:26:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2EDE861452 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Si2TgM7wQLmh8yPIt0hnbeVF8cwnxk+MGO9RUMuw9WY=; b=jwK6eT0Tgzg0ct 05adbIkn9Z3FrrBl5ByWnHez+Z6vfr7D6S6SdZOIFjyP4N4sAmmCmr5GyTicQskdukhj4LSV+UWan tNd4yPjz1ZazUPrITmlw6V7XvjhbSvDytBZGHOOX+nvWV8vEnXadnvC62Sp9Tlsnl5NoxOmV/GwiS XZTcQ+bCK+kczXt8VfbM/tHyzfP5dIyEHsPmTUKV3zbDO0DhNEn0GCMK+SR2d84fQ6sL6s4kwaAke Dj5nd9Sh0XAgUr9myuTQiF6nL5dquc7DhBNgio3N7/pK3cc4OgAsp8AwHTQjo/OY1ijKE1yMNKy+s COCoKsIKOEOy07jBqtSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mVcNr-00Bnhd-Om; Wed, 29 Sep 2021 16:24:40 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mVcNl-00Bnfh-L0; Wed, 29 Sep 2021 16:24:34 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 36D3461440; Wed, 29 Sep 2021 16:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632932673; bh=w4VJ0cTrcVdnFPOz099Y8UG/uO+ZbS2A3UhOj01R4SI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=boVv8N2dksnZXdTCWUBJUd4AG5QEJsKyjisvpIIvRYNyjyxLOHvLxSS4ZoSFOQB/D G+tWMSoaQCgfJ5BABvIP8m6wvc5R/+MTW7PmuM0otR9fKnh1ij6wgXbOCtwWFND66b EEwc2vo5okag4C6ZXEbv+6o+1AJ05Y/kmkTqR9mjFX/RzRGoSamKwWFr3E6ifpgHcH jY0yzP+ZkMWorb2JjcyaBIHVjt+lR+f7D2chVjxfPnLBHWIOF3OHzB2uKPstckMJPA FFl9E0tG2kaHzFoHFVSSsO5Cbfvjzedc17Bu29DLiCMIzZ2R9gOtXankzvRY91cK/3 R2/C4U1t20AGw== Date: Wed, 29 Sep 2021 17:24:28 +0100 From: Will Deacon To: Coiby Xu Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Coiby Xu , Catalin Marinas , open list Subject: Re: [PATCH 2/2] arm64: kexec_file: use more system keyrings to verify kernel image signature Message-ID: <20210929162428.GG22029@willie-the-truck> References: <20210927005004.36367-1-coiby.xu@gmail.com> <20210927005004.36367-3-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210927005004.36367-3-coiby.xu@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210929_092433_725900_99C0F814 X-CRM114-Status: GOOD ( 16.74 ) 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 On Mon, Sep 27, 2021 at 08:50:04AM +0800, Coiby Xu wrote: > From: Coiby Xu > > This allows to verify arm64 kernel image signature using not only > .builtin_trusted_keys but also .secondary_trusted_keys and .platform keyring. > > Signed-off-by: Coiby Xu > --- > arch/arm64/kernel/kexec_image.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c > index 9ec34690e255..2357ee2f229a 100644 > --- a/arch/arm64/kernel/kexec_image.c > +++ b/arch/arm64/kernel/kexec_image.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -133,8 +132,7 @@ static void *image_load(struct kimage *image, > #ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG > static int image_verify_sig(const char *kernel, unsigned long kernel_len) > { > - return verify_pefile_signature(kernel, kernel_len, NULL, > - VERIFYING_KEXEC_PE_SIGNATURE); > + return arch_kexec_kernel_verify_pe_sig(kernel, kernel_len); I'm fine with this in principle, but it looks like the first patch is the important one. So for the arm64 bit: Acked-by: Will Deacon Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Wed, 29 Sep 2021 17:24:28 +0100 From: Will Deacon Subject: Re: [PATCH 2/2] arm64: kexec_file: use more system keyrings to verify kernel image signature Message-ID: <20210929162428.GG22029@willie-the-truck> References: <20210927005004.36367-1-coiby.xu@gmail.com> <20210927005004.36367-3-coiby.xu@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210927005004.36367-3-coiby.xu@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Coiby Xu Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Coiby Xu , Catalin Marinas , open list On Mon, Sep 27, 2021 at 08:50:04AM +0800, Coiby Xu wrote: > From: Coiby Xu > > This allows to verify arm64 kernel image signature using not only > .builtin_trusted_keys but also .secondary_trusted_keys and .platform keyring. > > Signed-off-by: Coiby Xu > --- > arch/arm64/kernel/kexec_image.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c > index 9ec34690e255..2357ee2f229a 100644 > --- a/arch/arm64/kernel/kexec_image.c > +++ b/arch/arm64/kernel/kexec_image.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -133,8 +132,7 @@ static void *image_load(struct kimage *image, > #ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG > static int image_verify_sig(const char *kernel, unsigned long kernel_len) > { > - return verify_pefile_signature(kernel, kernel_len, NULL, > - VERIFYING_KEXEC_PE_SIGNATURE); > + return arch_kexec_kernel_verify_pe_sig(kernel, kernel_len); I'm fine with this in principle, but it looks like the first patch is the important one. So for the arm64 bit: Acked-by: Will Deacon Will _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec