From patchwork Fri Apr 1 01:31:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12797834 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 D9F1AC433EF for ; Fri, 1 Apr 2022 01:33:26 +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=P+sfDhvWhTKZ7m+oABa6rQZXkcHFGxmTPXHZdT6RDUg=; b=jicRS0WHGxCJYn sBMRGBRW+FfU+RaJMVJhTO0nK/ctcyxqhIFaR2LBFuVptwHF0RYscGUvFbaORGysQLDBQ+lNDXGQV 78hRXs1Nu9flW+i8BBnn6Qw1E0NYlojKDDg+GinIlw373o7W+ZkkCydFHczXBv7K7Fu4EUrUN2X8/ rcVZ8R9sGTMKd6nHd7D1GcBmm/XGnQq/k1CXl6BwJwWtAExa1k3skhFx5u2EPOu5rM0Gmf1i65CvJ jyKiQBYVzZUSd7+2PHwPi7BmRsMPd10pdDO3dhZZdWvylnI0cy9XUZmLnrF3AGtzwdkZcSx0sD0v3 mxjRpTg3vRENt98FZfoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1na68Z-004Akl-73; Fri, 01 Apr 2022 01:31:39 +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 1na68O-004Ai9-7s for linux-arm-kernel@lists.infradead.org; Fri, 01 Apr 2022 01:31:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648776687; 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=63ahIHb1A6QnEpYKNiglm5VmzrC+Q55jXB/IrtWitwg=; b=ViDJzlNxeUOhhbIxMQiZWHqfSBk29jrYxjr9CjoABOCM63k1f9czxhLrxU5aKxgeR0Kzpa NZbo7L74ve6YSMj5aJHSOPEPj91HNkxMHzCrBfj0veLUHpSvA01FYAM4tULeXUvuIxK86n JzTZ/DeSuXg4XkZtdkVqmH/Fm3eUbOE= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-Dt0sa7M3OpSW1cbIJV0WcA-1; Thu, 31 Mar 2022 21:31:26 -0400 X-MC-Unique: Dt0sa7M3OpSW1cbIJV0WcA-1 Received: by mail-pj1-f70.google.com with SMTP id j15-20020a17090a2a8f00b001c6d6b729f1so619223pjd.3 for ; Thu, 31 Mar 2022 18:31:26 -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=63ahIHb1A6QnEpYKNiglm5VmzrC+Q55jXB/IrtWitwg=; b=gNaDrFE3p7bSV6Ee5fBG4gMV51HsSWFgtSHJACb8UbXBAMZFtEvlD3p9TV01je/vYO z7zEsRsOzOgltZnaazRVylAMQvudVXcxdIdWI0IJa5oczJ2PGzkuJCN01JqSx/RHE2Z7 hlFh2NzBkQgbt4O8XLIKH7Je9ZHN2IEGYj3NTrWSr0OhkA0usHOP2K9VvwISJyNxCpU7 YotFOo1Yn5uU6XOmGw7V49T0wY3hLP1Asqa0q05TQt806sUHIvvHqNdROiN88EGvOVtD GnezAW3CBL04KdfjBlh30O5kCr9++3d+l0HfmJb6C1htt1e5IZxmjBlNSO4U5Lji5JrI pE/g== X-Gm-Message-State: AOAM533WTOnb8CMiMOuxQQHy623f2m2ux6/G9wiwAY532DGjCL+qignv lS0KNFHlJVGtBwKMABle6Xo4nIIUvU6MawKuqewSTemYNTRWcjIWp+ms0kBv0H4PvMjvzENGFL/ lJ0H+sNP9q0LIvVtHGeLwI248ySyLNruTDZA= X-Received: by 2002:a17:902:8491:b0:14e:dad4:5ce5 with SMTP id c17-20020a170902849100b0014edad45ce5mr7839471plo.76.1648776684810; Thu, 31 Mar 2022 18:31:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe5ZnYVdI4Y0iKlg94zYCaIwF36XwQHqq65KsuJ52g066rNTebA/TD0z8Q++cV2HBL58QVCA== X-Received: by 2002:a17:902:8491:b0:14e:dad4:5ce5 with SMTP id c17-20020a170902849100b0014edad45ce5mr7839451plo.76.1648776684509; Thu, 31 Mar 2022 18:31:24 -0700 (PDT) Received: from localhost ([240e:3a1:31c:360:52fc:c968:cb41:efbc]) by smtp.gmail.com with ESMTPSA id q15-20020a056a00150f00b004fb28ea8d9fsm741915pfu.171.2022.03.31.18.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 18:31:23 -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 v5 1/3] kexec: clean up arch_kexec_kernel_verify_sig Date: Fri, 1 Apr 2022 09:31:16 +0800 Message-Id: <20220401013118.348084-2-coxu@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401013118.348084-1-coxu@redhat.com> References: <20220401013118.348084-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-20220331_183128_388334_1C77CF36 X-CRM114-Status: GOOD ( 14.17 ) 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 Signed-off-by: Coiby Xu Reviewed-by: Michal Suchanek --- 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)) {