From patchwork Fri Mar 18 09:40:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12785077 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 DDDABC433F5 for ; Fri, 18 Mar 2022 09:42:36 +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=9eh5fzLLd0vDIrHJ8RXu2RMIrBvLisarXoewytpasu8=; b=kxLcqbSZDdfwuo BWOinIsD59eVT0sK0K14uf1l9Jys2zQp6HQlA9MYOuIHoDEbDMYbjSV0WG8W7sl6R6ignjFsxBBvR WF5aqYlPoqXWCyAr29v0kLLAjNx9DFvNbvAi9ouE5O1C3Iq2v+J74y2JYqEjP7AcwOuXK+veNP4pB egiNTNlTsjUYkEgdf8kMw2ua8nLNKghzYflfTzjkzot7nyeZxHPm12icxZDSK7NlkAmdPXvu55sdB cIebULywadOHpk/ckQ3oXs6NEGVfIkOukx9Q9uSl+aj/p6OGyA67CgXt6SsinMRt6TqfyaNEiCD6/ Hk4LPcGxzeIr8I7IN4mQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nV96q-000zy7-My; Fri, 18 Mar 2022 09:41:24 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nV96d-000ztV-U8 for linux-arm-kernel@lists.infradead.org; Fri, 18 Mar 2022 09:41:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647596470; 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=gwB9ZURkcH7/Y+etuUEb9xxXjVVCmMsQlrMh7LXVjOY=; b=b7eNLCj1+oycnLGllfRIb4LlfvNDURBVTsaxTWl32hadnEEhPBx3W1wFc9LxdgBUUXqGx+ fCnix96lqbJkZ5kKz+8h75P3b6wO99XEZN5XwUm2pIr6BoEm9caHusqsBQcpe4OYwAsnVf XEZWzKeu0FtYr924j7B0HmbQ8b0Pl3c= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-186-mDYHr686Nxa5CC2_hrM_gg-1; Fri, 18 Mar 2022 05:41:09 -0400 X-MC-Unique: mDYHr686Nxa5CC2_hrM_gg-1 Received: by mail-pf1-f197.google.com with SMTP id b19-20020a621b13000000b004fa68b3677bso1503602pfb.20 for ; Fri, 18 Mar 2022 02:41:09 -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=gwB9ZURkcH7/Y+etuUEb9xxXjVVCmMsQlrMh7LXVjOY=; b=qdF+kTth8EfOeTKm36Ay67WhuF2oVOQev5YADZLNHnAzr9zFkOjF5N3rAms5RdR390 bX0YUHojZPp/hFy1K4Y7Ezg5bTMBqwXLlRBVclYbv+HOVI+uPb+PR/nCeZ1we3auVssY S3pUviBd1M0/OfvmfNc3McrXobEcxWmmUrKR3PjRltsK1bO1lIGDup2UggVWnFjyF9Bz NAYT3/jk9XNhMnacJtNSr0yqMozFu1PlMdWmZGHQ4udfRGzfGa0gi2sbH6Cba1y0qKZ/ umCSqEuP0QE5YEZt7AwfAnSo1mC3rwcj1VkavzO8fOVfW90O0zVofU1pozsW7vhU0Eqs fiKQ== X-Gm-Message-State: AOAM533EW+ME8BowN+PEJc4VfyNO53Q8/qKPIHvUavnpAOotZbV0/2MD MMUnRguhHOk6mWVhR6ZHrMUzuWEgoW9LM06IX0V2AoKue19Lc16AxtQigmzcXr9LSD2Lk6M6I+d bQAsiTl2lal5lSqp0uU0gmZfYiAw4Lc382ho= X-Received: by 2002:a17:90a:ca96:b0:1c6:b478:788e with SMTP id y22-20020a17090aca9600b001c6b478788emr1699045pjt.162.1647596468356; Fri, 18 Mar 2022 02:41:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgBkcXsK1rGQ1Ahb6434nwbtdmmC/q90wdZ/LIeinBZlv3tTPqVTddL5TmOxAl7jnaZ1Gryw== X-Received: by 2002:a17:90a:ca96:b0:1c6:b478:788e with SMTP id y22-20020a17090aca9600b001c6b478788emr1699023pjt.162.1647596468092; Fri, 18 Mar 2022 02:41:08 -0700 (PDT) Received: from localhost ([240e:3a1:2e5:800:f995:6136:f760:a3d0]) by smtp.gmail.com with ESMTPSA id m18-20020a639412000000b003820bd9f2f2sm3599952pge.53.2022.03.18.02.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 02:41:07 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, Baoquan He , Dave Young , Will Deacon , "Eric W . Biederman" , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 1/3] kexec: clean up arch_kexec_kernel_verify_sig Date: Fri, 18 Mar 2022 17:40:59 +0800 Message-Id: <20220318094101.274950-2-coxu@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220318094101.274950-1-coxu@redhat.com> References: <20220318094101.274950-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-20220318_024112_080983_05D2ABA7 X-CRM114-Status: GOOD ( 13.80 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 9ec4ecef0af7 ("kexec_file,x86,powerpc: factor out kexec_file_ops functions") allows implementing the arch-specific implementation of kernel image verification in kexec_file_ops->verify_sig. Currently, there is no arch-specific implementation of arch_kexec_kernel_verify_sig. So clean it up. Suggested-by: Eric W. Biederman Signed-off-by: Coiby Xu --- include/linux/kexec.h | 4 ---- kernel/kexec_file.c | 34 +++++++++++++--------------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 0c994ae37729..755fed183224 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -196,10 +196,6 @@ 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 -int arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, - unsigned long buf_len); -#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 8347fc158d2b..3720435807eb 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -89,25 +89,6 @@ int __weak arch_kimage_file_post_load_cleanup(struct kimage *image) return kexec_image_post_load_cleanup_default(image); } -#ifdef CONFIG_KEXEC_SIG -static int kexec_image_verify_sig_default(struct kimage *image, void *buf, - unsigned long buf_len) -{ - if (!image->fops || !image->fops->verify_sig) { - pr_debug("kernel loader does not support signature verification.\n"); - return -EKEYREJECTED; - } - - return image->fops->verify_sig(buf, buf_len); -} - -int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, - unsigned long buf_len) -{ - return kexec_image_verify_sig_default(image, buf, buf_len); -} -#endif - /* * arch_kexec_apply_relocations_add - apply relocations of type RELA * @pi: Purgatory to be relocated. @@ -184,13 +165,24 @@ void kimage_file_post_load_cleanup(struct kimage *image) } #ifdef CONFIG_KEXEC_SIG +static int kexec_image_verify_sig(struct kimage *image, void *buf, + unsigned long buf_len) +{ + if (!image->fops || !image->fops->verify_sig) { + pr_debug("kernel loader does not support signature verification.\n"); + return -EKEYREJECTED; + } + + return image->fops->verify_sig(buf, buf_len); +} + static int kimage_validate_signature(struct kimage *image) { int ret; - ret = arch_kexec_kernel_verify_sig(image, image->kernel_buf, - image->kernel_buf_len); + ret = kexec_image_verify_sig(image, image->kernel_buf, + image->kernel_buf_len); if (ret) { if (IS_ENABLED(CONFIG_KEXEC_SIG_FORCE)) {