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 4F96CC433F5 for ; Thu, 12 May 2022 06:24: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-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=6tjJPx775oKGR86Rus96rKJEOLtWGlpqXL/wS0CIy6Q=; b=CtV4eyBDr96QH5 qmyZFWQhKHcuVrK5lduGpm5aSav3++HgCYYhjQYGcsDdzJex+nQSxfDiEKut6tzzl6ga3Ux82K3Sg 9SpNcDufna/UoI0YJrH2l949mFUDppWW0easyV1MXWE6PfLgf3rjxaRfx4dmr5mBWIst6LJ9ZBPpq gTByUFzrq2aKaqlnZzrnvDtdDJDBoaxFW4oFBFHW2//lNqBRITiSUMU03w7qNxQ5oji1DUrSaKp2+ GaHKxKkC+dPBV6HzrbAWHceLgNDAW4t+YGE8L0/jAdeuXBId5Kal46HpTvykC7BK77Ss+dIOmV2qK hLUP/0E/C9x7gSPXjPGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1np2E9-00ANvU-So; Thu, 12 May 2022 06:23:09 +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 1np2E6-00ANuc-MA for linux-arm-kernel@lists.infradead.org; Thu, 12 May 2022 06:23:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652336585; 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: in-reply-to:in-reply-to:references:references; bh=gu9u72Bn5KZQJL5OHuIKH7wOoRokqxGGSIy5PLn3fYs=; b=d1wNdf0N9iFux+t9zUApXsbTRXfHGAyXpHcYMtZy+rwzVUCvuW98wO1RSgNQXrw57A22xh J2DPPGAuIcIbkwZvaTqfQbhRnhQvrZNAVd1DAfMteG0Vhsr2OlUa8EDJvWg0hI81+Kxcgx Buahi94OsehuyK1JHekUGBLCl4ypfeY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-439-YZ9qbDKqPymGnrE5fpLnxQ-1; Thu, 12 May 2022 02:23:02 -0400 X-MC-Unique: YZ9qbDKqPymGnrE5fpLnxQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 836B680159B; Thu, 12 May 2022 06:23:01 +0000 (UTC) Received: from localhost (ovpn-13-176.pek2.redhat.com [10.72.13.176]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C569E400E400; Thu, 12 May 2022 06:23:00 +0000 (UTC) Date: Thu, 12 May 2022 14:22:57 +0800 From: Baoquan He To: Coiby Xu Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Michal Suchanek , Dave Young , Will Deacon , "Eric W . Biederman" , Mimi Zohar , Chun-Yi Lee , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, stable@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "H. Peter Anvin" , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" Subject: Re: [PATCH v7 2/4] kexec, KEYS: make the code in bzImage64_verify_sig generic Message-ID: References: <20220512023402.9913-1-coxu@redhat.com> <20220512023402.9913-3-coxu@redhat.com> <20220512043310.v3e22423ybe4z65e@Rk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220512043310.v3e22423ybe4z65e@Rk> X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220511_232306_826297_A3FF298A X-CRM114-Status: GOOD ( 44.90 ) 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 05/12/22 at 12:33pm, Coiby Xu wrote: > On Thu, May 12, 2022 at 11:52:09AM +0800, Baoquan He wrote: > > On 05/12/22 at 10:46am, Baoquan He wrote: > > > On 05/12/22 at 10:34am, Coiby Xu wrote: > > > > commit 278311e417be ("kexec, KEYS: Make use of platform keyring for > > > > signature verify") adds platform keyring support on x86 kexec but not > > > > arm64. > > > > > > > > The code in bzImage64_verify_sig makes 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. > > > > > > > > Note this patch is needed by a later patch so Cc it to the stable tree > > > > as well. > > > > > > This note should not be added in log. > > > > > > > > > > > Cc: kexec@lists.infradead.org > > > > Cc: keyrings@vger.kernel.org > > > > Cc: linux-security-module@vger.kernel.org > > > > Cc: stable@vger.kernel.org # 34d5960af253: kexec: clean up arch_kexec_kernel_verify_sig > > > > Hold on, should we CC stable when it's not fixing an issue? > > > > Hi Coiby, > > Hi Baoquan, > > > > > Just to make clear , is this patch fixing an issue, or it's just an > > preparation for later patch's use? > > > > Or I should ask in another way, any problem is solved with this patch? > > At least it doesn't fix an issue that satisfy the criteria listed in > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html Then it should not be CC-ed to stable. > > > > > > > > > Reviewed-by: Michal Suchanek > > > > Signed-off-by: Coiby Xu > > > > --- > > > > > > You can put the note here, it won't be added to commit log when merged. > > > Maybe it can be removed when merged. > > Thanks for the suggestion! Shall I send a version to fix this problem or > can I just bother the maintainer to remove it? Better send a clean one, it will save maintainer's time, they can pick it directly. > > > > > > > > Otherwise, LGTM > > > > > > Acked-by: Baoquan He > > > > > > > arch/x86/kernel/kexec-bzimage64.c | 20 +------------------- > > > > include/linux/kexec.h | 7 +++++++ > > > > kernel/kexec_file.c | 17 +++++++++++++++++ > > > > 3 files changed, 25 insertions(+), 19 deletions(-) > > > > > > > > diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c > > > > index 170d0fd68b1f..f299b48f9c9f 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 > > > > @@ -528,28 +527,11 @@ static int bzImage64_cleanup(void *loader_data) > > > > return 0; > > > > } > > > > > > > > -#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; > > > > -} > > > > -#endif > > > > - > > > > const struct kexec_file_ops kexec_bzImage64_ops = { > > > > .probe = bzImage64_probe, > > > > .load = bzImage64_load, > > > > .cleanup = bzImage64_cleanup, > > > > #ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG > > > > - .verify_sig = bzImage64_verify_sig, > > > > + .verify_sig = kexec_kernel_verify_pe_sig, > > > > #endif > > > > }; > > > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > > > > index 413235c6c797..da83abfc628b 100644 > > > > --- a/include/linux/kexec.h > > > > +++ b/include/linux/kexec.h > > > > @@ -19,6 +19,7 @@ > > > > #include > > > > > > > > #include > > > > +#include > > > > > > > > /* Location of a reserved region to hold the crash kernel. > > > > */ > > > > @@ -202,6 +203,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.35.3 > > > > > > > > > > > -- > Best regards, > Coiby > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel