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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B574FC433EF for ; Mon, 4 Jul 2022 01:52:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233008AbiGDBwi (ORCPT ); Sun, 3 Jul 2022 21:52:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230122AbiGDBwg (ORCPT ); Sun, 3 Jul 2022 21:52:36 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 023A92630 for ; Sun, 3 Jul 2022 18:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656899555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MT59o1vyNl28UvpV0L18f4IgJU3gRlDgKTViOwYZmyQ=; b=eEpWcI/Z+f/vt/LzllXY+ykW6h7C/Ra2H5+yx/Csxg6Ts0WbEg3z50bLds8hruTAAkQFZ6 FFTZfAqjEOuD274YawWZ3IXezBh/Edy+qJKmSY0k1O0sToO4K5pQTwkz4BRs9l1oFEXHik wI+ASgvv6wK8fHgxX0WsGD+5614DSOQ= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-179-5rsOxZp4MVOJ5uMDyo_0Zw-1; Sun, 03 Jul 2022 21:52:34 -0400 X-MC-Unique: 5rsOxZp4MVOJ5uMDyo_0Zw-1 Received: by mail-pj1-f71.google.com with SMTP id o8-20020a17090ab88800b001ef81869167so1708412pjr.2 for ; Sun, 03 Jul 2022 18:52:33 -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=MT59o1vyNl28UvpV0L18f4IgJU3gRlDgKTViOwYZmyQ=; b=3FnD3eDnWVqvO/Onzj1LRmOIfpWW9YTjDbVYzcsV+hUkOYAUYglLP0Tg2KMiTVhNxd x3qf5NZTB4hpDNeWpkEOtNt/iPRjZyZRumL6A7bn1/aco0BDat37P5xsv4qSR5NZGfBN 08TQt3zSm5Wr9097Ce46qlvUlRchZlDsCvrGE5BN7u/ZCpjLAOaXWn+0UWl+ROdBxGky iKMYmFtVEIxShiKCg9R4KiJflMGsH/tj2ptGpdZxBKJkFt630o6mczW3C4pLVkOcow1e RYj/dQ0DLnTSiAdk3wzMU+vjDXASJThJhFHV1/nlSFGuuig4qzISdCuAgEw7JDDPzMaF 81Gw== X-Gm-Message-State: AJIora+DWCUTUaYLDj9/vXZ5QuHpb/8FC4zOb5rwJfuR3ScMfFIMGoq+ QsOVfT/ReRi/C3Cz6Mc89DwkO/PYkS1I8/DyQEH1Hu/F5oka3lFQmD9roJKV0YOzk7fU9Fz5PYs rsXdrPZ9Nq8+hzzXWTz9/3dzf X-Received: by 2002:a05:6a00:134b:b0:525:b7cc:30b5 with SMTP id k11-20020a056a00134b00b00525b7cc30b5mr34248661pfu.32.1656899551989; Sun, 03 Jul 2022 18:52:31 -0700 (PDT) X-Google-Smtp-Source: AGRyM1swtT1/ZGRM402/NNr6/11axGlFQ3W8t6/TrZaLKS4HwWEg/bXgrfKUGlU7DvgjIxWMijELOQ== X-Received: by 2002:a05:6a00:134b:b0:525:b7cc:30b5 with SMTP id k11-20020a056a00134b00b00525b7cc30b5mr34248637pfu.32.1656899551714; Sun, 03 Jul 2022 18:52:31 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id v6-20020a1709029a0600b0015edc07dcf3sm19697225plp.21.2022.07.03.18.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 18:52:31 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org, linux-integrity@vger.kernel.org Cc: Mimi Zohar , linux-arm-kernel@lists.infradead.org, Michal Suchanek , Baoquan He , Dave Young , Will Deacon , "Eric W . Biederman" , Chun-Yi Lee , stable@vger.kernel.org, linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 1/4] kexec: clean up arch_kexec_kernel_verify_sig Date: Mon, 4 Jul 2022 09:51:58 +0800 Message-Id: <20220704015201.59744-2-coxu@redhat.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220704015201.59744-1-coxu@redhat.com> References: <20220704015201.59744-1-coxu@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. Note this patch is dependent by later patches so it should backported to the stable tree as well. Cc: stable@vger.kernel.org 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 ce6536f1d269..e3125fae1599 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -194,10 +194,6 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, unsigned long buf_len); void *arch_kexec_kernel_image_load(struct kimage *image); 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 145321a5e798..c7cbadc754a1 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 - /* * Free up memory used by kernel, initrd, and command line. This is temporary * memory allocation which is not needed any more after these buffers have @@ -150,13 +131,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)) { -- 2.35.3