From patchwork Thu May 12 07:01:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12847225 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 0DB88C433F5 for ; Thu, 12 May 2022 07:03:02 +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=3225S5ESd6hb30rN56iQxN1ItlqXWytuurXoRqO7mMg=; b=W/Y0fxkrYac0HM qElsTqEG8nvfey+TtW1DQrDwW9MmvXZfyV2CIWp98+v0FMFBAbGk6njY8rLF4oETqZ7cpalyaz7sy Eg7Ly3NOHoo7fhon4XrQjKQ05J+ZfFUl5XH9kn/ntuIple1BAgHr7AJsv5/tF2qKrTxbI3p6GQOqa lvtH8Voo6TA3v40K3G9O17J+7JhvDt9f6y2nG89eZ2nqEpCc2FguJeG8Wnpcy2TBAt7BxEin9aMSg XtBZ0FY2UkI/oewRtPT2NoNKi0WTkEHo6UllK+yDPq92J1uv+4Y15sKEwgo3UqSFfmaMiIh6ll3nr WUeVwZCho3ms1g46qjOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1np2pY-00AcG7-DA; Thu, 12 May 2022 07:01:48 +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 1np2pI-00Ac7j-Ab for linux-arm-kernel@lists.infradead.org; Thu, 12 May 2022 07:01:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652338891; 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=qCJO+RNZFCWFbvical/P2gICaKsGaW3kZmBlIuAflVw=; b=JOtlHNGqa4bAE813nPVNmXhy2Mx+D9etMQNf5yscX7jvnkjlG6LcgWE1MLKL2t3yZ2aa9L bL0EltS0lfKrFqO97ozo4q7y6EIHOprzGhX4doAp+n6KE2taOvBuydHAYroGKOjV5gZA1v Q+7/KlfF9deRfAY6HbEZ8wdWk2ehvHo= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-643-Hg7pTAuEOxKAL8sFCkLgAA-1; Thu, 12 May 2022 03:01:30 -0400 X-MC-Unique: Hg7pTAuEOxKAL8sFCkLgAA-1 Received: by mail-pj1-f69.google.com with SMTP id o7-20020a17090a0a0700b001d93c491131so4198443pjo.6 for ; Thu, 12 May 2022 00:01:30 -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=qCJO+RNZFCWFbvical/P2gICaKsGaW3kZmBlIuAflVw=; b=Ep7ODkThEdTXxzzdtS4yAQCeCJgABX72kLujQ0ZsP+5p1cSicIdmM/DZSMYRSjW3t4 w4aO5yjSIA/bEZNetocHNjlBTZJghB2/FDi8QK3BnKmkePkQ6U9O7gkaGEzh+GWX4C9L v66hZOY1NMobofqHGQYTCRMEH5AuXEpQWytgBsQrguSIhiIgQSbesHfmraNE+6rUlqxX wBtOzE97Ck8mZGLsZX3may2kO1+uI1qfwxMPrR2QlXhFyn8eIIKflfdic4mfUq4OMJwH XWvJNS6AqNUosI/n+0CHb1wv/lmxM8mvvVwp6khIPs8qD+2bBfLJ9mq7WOCIcyOPuAQ8 Hytw== X-Gm-Message-State: AOAM533JUzZQqkKrmpsjTgIW3kvCXh5NbEO4p3feHU3K/H05Pxucfnut 48uKwCkH4LT6fuMVL0SjD1z8VLDTpjyTRdgJYp44c69tcN2uiwHR3hx2na5tPTZoOT+uDsFdXAj Yos14NPKXbgFg6LbX0Nhmst8XdSRvOJU7bxI= X-Received: by 2002:aa7:9109:0:b0:50a:78c8:8603 with SMTP id 9-20020aa79109000000b0050a78c88603mr28527888pfh.77.1652338889150; Thu, 12 May 2022 00:01:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwI4KLqu3XPMmJRgrRI1AQSmd2vuUO9Ery3UYOJ2pMkClSuI93JjOxZe+aoInV9a9hDdY685A== X-Received: by 2002:aa7:9109:0:b0:50a:78c8:8603 with SMTP id 9-20020aa79109000000b0050a78c88603mr28527872pfh.77.1652338888845; Thu, 12 May 2022 00:01:28 -0700 (PDT) Received: from localhost ([240e:3a1:2e9:efa0:e73c:e550:ac9e:58fd]) by smtp.gmail.com with ESMTPSA id t22-20020a1709028c9600b0015e8d4eb2aesm3061225plo.248.2022.05.12.00.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 00:01:28 -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 , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 1/4] kexec: clean up arch_kexec_kernel_verify_sig Date: Thu, 12 May 2022 15:01:20 +0800 Message-Id: <20220512070123.29486-2-coxu@redhat.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220512070123.29486-1-coxu@redhat.com> References: <20220512070123.29486-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-20220512_000132_463540_59360960 X-CRM114-Status: GOOD ( 14.85 ) 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 Currently there is no arch-specific implementation of arch_kexec_kernel_verify_sig. Even if we want to add an implementation for an architecture in the future, we can simply use "(struct kexec_file_ops*)->verify_sig". So clean it up. Suggested-by: Eric W. Biederman Reviewed-by: Michal Suchanek Acked-by: Baoquan He 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 58d1b58a971e..413235c6c797 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -202,10 +202,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)) {