From patchwork Mon Jul 4 01:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12904567 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 5400AC43334 for ; Mon, 4 Jul 2022 01:54:00 +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=+CHC6bQyUYUTeYjJCsC2zKzyFkVguk1/n/5a1//B8p8=; b=q7od7yQe+Aq1pW BUjSeGe/1VfjJkRzlneVxpRAWpT4vp2kcGybG5XaZQO74cN9nz11PR1N2vyUuBMJHZdmL7vd9VukY bLWFej1KmaITwREmGtNPx6ICIK0AJn44ITor+iNPKIOw5o0aan8JKk1MncnJO6LZv0zbEwTv7YAcG bTtKTEnsab3i5zfDh7kEahixzrlM5FFKlTst45gaiELFP2BA4wZVlD8LowQuxGWT0glue8YVDhGoC yFtl/9oiqeZKYJV9X/2AA/kgGtMc2BuzE2e5sQY7jHJeTy/f2o06SP0F4ez5zV0G8ESw6Y7U3vwb5 PScbGNfY8iV8fK7tLg+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8BGQ-0037QW-EY; Mon, 04 Jul 2022 01:52:38 +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 1o8BGN-0037NT-8l for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 01:52:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656899554; 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=MT59o1vyNl28UvpV0L18f4IgJU3gRlDgKTViOwYZmyQ=; b=B6UBQZ/qzjFCkYMnRrcrp/Bo4geB0AdxdqBHMzUUw6gMj2iFRh8NCyGZk+dFmYeDLs/kMQ oIacnBEcyQliV0Da5d1NobikogZ4bmtYE5Gk0ZOmHghs2Ir5l2mlOj9gk4N5hu6OhlK6PK 3Mgo1+hYw94nJMXwLg3l5Rw4Zt7+pCU= 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-538-L_7t466uPreb1Bsf_2FfuA-1; Sun, 03 Jul 2022 21:52:33 -0400 X-MC-Unique: L_7t466uPreb1Bsf_2FfuA-1 Received: by mail-pj1-f69.google.com with SMTP id v19-20020a17090abb9300b001ef7bbd5a28so2346629pjr.0 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=cJ/WY1bFv8xa6hs/rvQ5N57MvNJlnu6ZAHCJhTZiKbRRCe7fz4zbhdJ0zJOVbIiSw2 vPRiqIcIURVaIOJR/mIndeNWxzrO0Un8urn588of7ygN/wDNRn4+nTSuF7qYId7ND7X7 EG2+Yv3d+QXXrZDMnYbLStX88Xg4QQpHyxjweIlNz65t/3EphgUTCJnY2StyxHUBT1Vi WuUzsXbZYxp7SLnJ+i/d4snaJa4D/o8CDpPe0Y4fuDUwrrHmTYjrMTPvw2APZpNVbZmv 16LguQ0fIbgkRL2X6/s+Sn48aAt7i+KItVo4JYEGA2k7ySiATeNjREtm8asnH6frSoGA Hlww== X-Gm-Message-State: AJIora/9uW8miuW94Oqk3XM6tnkb0amFxgAxFBHpOdKVwFr5QQ3b7e8w o752cTAjOff5WbZkSu+zpm4UHGKNpXZvxlS5DhrIkU28xvq0vMBSfpz2MKlEfs5hv8A+6g/ciUC 6Tmz0hA4PxpDqCLlWaOzD/zvqr42NdFF+JAg= X-Received: by 2002:a05:6a00:134b:b0:525:b7cc:30b5 with SMTP id k11-20020a056a00134b00b00525b7cc30b5mr34248659pfu.32.1656899551988; 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 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-20220703_185235_419797_291A99FE X-CRM114-Status: GOOD ( 16.65 ) 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. 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)) {