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)) { From patchwork Mon Jul 4 01:51: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: 12904568 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 60075C433EF for ; Mon, 4 Jul 2022 01:54:12 +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=bcvSMQvar/e6GBbarrcBcF7+IWngFpT67gPjYFulnNI=; b=kggNw24Z5ryt4r kulS3qprAzE9+g1Wv91rkBVhyh9xoZW325cO2r9m4AJKgdjd++POOUvGyGAUs2SzTTGfIPbO8L7sB 7zuWDhw1AmI2t93JJAioJ2xaIxgORVXGVP1opcrz28TLrbUylCw2mJhyKUqBBWlj+enMEKCzf6A/J fIwqRkjf+AdpnYeAIopN0W+z1YZOeLf8618IuAlB6iHTpjVo43+rbmxhMVijuE6K4UJ1yDrerLcth ZNnUGvgm6WY86p40swhyK9JcuTLl5TGaaGP7vzSlZxrMzgfw4sFTHShX5bTpS3lHSEbqAs0WNphzv XDg4g79s/txx+Ypn1Ahg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8BGb-0037cf-9w; Mon, 04 Jul 2022 01:52:49 +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 1o8BGS-0037Rc-Q9 for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 01:52:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656899559; 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=nTUj8DskjrdqH+782mh4voi0bsQ4nV3nMCPn/39C26o=; b=K1WGqez3WYjjkCPfgTEMoNJwfJAgsLVyxbggpFyGpp1phvhggb/z/kHFcGhg/RzaPNmWV9 HKROlGA9q5TK1aZiTXxfAq5xmOMMo5Uk+xDa9ppIi5/yJ/Yj4k2fpSYDxq74b9hvk+FsQF a5D1NWlmhFhvp7bHZ6Ll4WuKNmVu4Y8= 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-543-dnVMNlNeMpiK772SE3LEDA-1; Sun, 03 Jul 2022 21:52:39 -0400 X-MC-Unique: dnVMNlNeMpiK772SE3LEDA-1 Received: by mail-pj1-f70.google.com with SMTP id j9-20020a17090a588900b001ef76562e7cso2382759pji.4 for ; Sun, 03 Jul 2022 18:52:38 -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=nTUj8DskjrdqH+782mh4voi0bsQ4nV3nMCPn/39C26o=; b=vRJzHVWdgIX4o0EgbYSNfmHE9r8gPi0MXa1sbj4hbK7t8ejcU4SCMrVu8z6BsIAPh9 9F/7yWhJO9NnR5xCZ3UIMihHqALK9V6t7rFkP+3Hty7nuCi1DeN+CbWSFJG18JNPQ72r NdejQT+hQHNH9nVNIeX1rnWQQcS9Qp4DvpsxsIc3oqC3bh9O6X79G5+o4qZvf/fv2sWK hJaJGjpA45UcfHxPfkktAYYsQ/aHJgGvYrNYr8YFqOPOJsv5GzSQjGl40npeWNGe3H9y I1SYofE0hnDIUlm2VuqPJc1UFWX0EVVorVAud5mqLArRp75Of/qYuEsDkgNy7KJ8/jjH nEKg== X-Gm-Message-State: AJIora9BBzuWnbSWD+Wa+8DiMtzgm+a4RpZWzC1Z/nm0dWJJMzBDpybv P/Kej5TAOgfji6RYhZTIKDrpbphh2eHmQ5MKkM4pNVIfiBZkZmZwpb7S8k8EGHvtUrR2oXvCpbD 2PGpHgXKEJqgwXKrGwXbnwU6lU1WPvij6NgQ= X-Received: by 2002:a05:6a00:14d3:b0:528:486d:d576 with SMTP id w19-20020a056a0014d300b00528486dd576mr10568895pfu.24.1656899556866; Sun, 03 Jul 2022 18:52:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sPC0DInjaucHaeeAE1l8WghG5rlTMFBew3zvn/xHz/06n1jLEOyrEMAmRej9+XCnhiWSv1dg== X-Received: by 2002:a05:6a00:14d3:b0:528:486d:d576 with SMTP id w19-20020a056a0014d300b00528486dd576mr10568874pfu.24.1656899556610; Sun, 03 Jul 2022 18:52:36 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id i13-20020a17090332cd00b0016b7c557e08sm11927704plr.56.2022.07.03.18.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 18:52:36 -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 , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH v9 2/4] kexec, KEYS: make the code in bzImage64_verify_sig generic Date: Mon, 4 Jul 2022 09:51:59 +0800 Message-Id: <20220704015201.59744-3-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_185241_596435_13E3F796 X-CRM114-Status: GOOD ( 16.12 ) 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 278311e417be ("kexec, KEYS: Make use of platform keyring for signature verify") adds platform keyring support on x86 kexec but not arm64. The code in bzImage64_verify_sig uses the keys on the .builtin_trusted_keys, .machine, if configured and enabled, .secondary_trusted_keys, also if configured, and .platform keyrings to verify the signed kernel image as PE file. Cc: kexec@lists.infradead.org Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Reviewed-by: Michal Suchanek Signed-off-by: Coiby Xu --- arch/x86/kernel/kexec-bzimage64.c | 20 +------------------- include/linux/kexec.h | 6 ++++++ kernel/kexec_file.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 170d0fd68b1f..f299b48f9c9f 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -528,28 +527,11 @@ static int bzImage64_cleanup(void *loader_data) return 0; } -#ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG -static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) -{ - int ret; - - ret = verify_pefile_signature(kernel, kernel_len, - VERIFY_USE_SECONDARY_KEYRING, - VERIFYING_KEXEC_PE_SIGNATURE); - if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { - ret = verify_pefile_signature(kernel, kernel_len, - VERIFY_USE_PLATFORM_KEYRING, - VERIFYING_KEXEC_PE_SIGNATURE); - } - return ret; -} -#endif - const struct kexec_file_ops kexec_bzImage64_ops = { .probe = bzImage64_probe, .load = bzImage64_load, .cleanup = bzImage64_cleanup, #ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG - .verify_sig = bzImage64_verify_sig, + .verify_sig = kexec_kernel_verify_pe_sig, #endif }; diff --git a/include/linux/kexec.h b/include/linux/kexec.h index e3125fae1599..620018bbc419 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -19,6 +19,7 @@ #include #include +#include /* Location of a reserved region to hold the crash kernel. */ @@ -194,6 +195,11 @@ 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 +#ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION +int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len); +#endif +#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 c7cbadc754a1..db6e89128b98 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -131,6 +131,23 @@ void kimage_file_post_load_cleanup(struct kimage *image) } #ifdef CONFIG_KEXEC_SIG +#ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION +int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len) +{ + int ret; + + ret = verify_pefile_signature(kernel, kernel_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_KEXEC_PE_SIGNATURE); + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { + ret = verify_pefile_signature(kernel, kernel_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_KEXEC_PE_SIGNATURE); + } + return ret; +} +#endif + static int kexec_image_verify_sig(struct kimage *image, void *buf, unsigned long buf_len) { From patchwork Mon Jul 4 01:52:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12904569 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 35054C433EF for ; Mon, 4 Jul 2022 01:54:32 +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=07pmzljc7/6zLUexqEhVUdxPmkQNTpSiOx85fjM1ovE=; b=ifWq5sWBmbekXA vv2Ll5QA/8ZymgAt7Inrsj9HGkpvcSnwvLn6Dk/QZ0+CG1oXnQq76I8ww6agfxLhBKfVpS/eGcOsW H3S+F3aqsh3kZEg44LHqMaQuvb4/cP6FcIsq6QhAvyDYEHHzkEkFdv+Mk9p1fOmVJtJdp+kCuACqF 70I7ataRPd5OvukjppjttPb2ogNMYkx8JiH89qP9em6a9nEHL80Yz1C5DymDh1wyVKFdRN5U1ZOEd CvXrnM9n6JMvLSSGIF7cOKYkiSODF0tXxyF/wFHHjyboHSbn1S0/rokd7AgCNGpgKh4Q+xX61aU0J zo34D3GYG/kQ6+57tBKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8BGn-0037qD-R2; Mon, 04 Jul 2022 01:53:02 +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 1o8BGa-0037bF-9Z for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 01:52:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656899567; 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=EE8ReJL35xooYMRcL0aldhKZVhFpWy3F9pc1cYwfnGA=; b=GaZgby1b4wzEbeutmrcHXSdq/a7Kui1peUS3Wd8R4k3Dx84nQC8w1ZT2ePa33gOVJ/t9N1 OWnn03W5wrykZQhXaEuZ6gxKA3Ejma23NjII9TU4ggPOZ6w2qQqV2YXJ9wgrBWjjvH3tzw hGO402LzH66J4g49epP6DkCpAv2vIBk= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-brtHc4T_MwGWRoNsb9q74w-1; Sun, 03 Jul 2022 21:52:46 -0400 X-MC-Unique: brtHc4T_MwGWRoNsb9q74w-1 Received: by mail-pl1-f198.google.com with SMTP id c16-20020a170902b69000b0016a71a49c0cso4331873pls.23 for ; Sun, 03 Jul 2022 18:52:46 -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=EE8ReJL35xooYMRcL0aldhKZVhFpWy3F9pc1cYwfnGA=; b=Til76XuZHGKAq2SWlRlQwljxLKcx+sw3xTlLQ6hC0sxxBe1jXTtWVNGZ6YOWGXyj/Z sqf+b04QU3fPdbZwdUJa/K9KxC+KG0jyCaAyd+FhqscL3CziWspwCV6yF3ZBE95WfHKH tlk8o7JKgY/DbeSqHbKTXPaSOeo5KGweLkd4+y+sl1VZ2EqQz9Dechu+/cx8pU6XIbPT QyMJPND43R9IxZ0Rgy90PMyuJGPHRQpgtj2hrE0MXwWgLl/FaduZCiei906qRst5mBrd kvJJjHYlEwhCJDeGjPdHTvGETTcpjZekpdstPyy1yjL3Xvcs1/rKXCB2wDYvX0HBWlGK hqzw== X-Gm-Message-State: AJIora9ChlKeuYgfhLE/aWZASefDLxShaMygSxF3MqusRJKnlRzBtDpX NxYOwgUI6sajkGsjiAuoevFpBVoERXM2nEPabH6dFyzSwjrrRizD6Tbh+fI7FywbFWSMQgLkNQk gPsPyEh85lnHt9SyC3NqETTnVk+JL/G4XprE= X-Received: by 2002:a17:90b:4d01:b0:1ef:54e4:f840 with SMTP id mw1-20020a17090b4d0100b001ef54e4f840mr19512585pjb.216.1656899565176; Sun, 03 Jul 2022 18:52:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vccVgOsoxySyE6jc8B09IaJFFIALoQ7zprfH6mR3bc+DIDyQRm0eLU55vBwyS03zmcKniWuQ== X-Received: by 2002:a17:90b:4d01:b0:1ef:54e4:f840 with SMTP id mw1-20020a17090b4d0100b001ef54e4f840mr19512561pjb.216.1656899564976; Sun, 03 Jul 2022 18:52:44 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id c12-20020a621c0c000000b0050dc7628178sm19752005pfc.82.2022.07.03.18.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 18:52:44 -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, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, Catalin Marinas , AKASHI Takahiro , James Morse , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 3/4] arm64: kexec_file: use more system keyrings to verify kernel image signature Date: Mon, 4 Jul 2022 09:52:00 +0800 Message-Id: <20220704015201.59744-4-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_185248_432693_26608520 X-CRM114-Status: GOOD ( 14.84 ) 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, when loading a kernel image via the kexec_file_load() system call, arm64 can only use the .builtin_trusted_keys keyring to verify a signature whereas x86 can use three more keyrings i.e. .secondary_trusted_keys, .machine and .platform keyrings. For example, one resulting problem is kexec'ing a kernel image would be rejected with the error "Lockdown: kexec: kexec of unsigned images is restricted; see man kernel_lockdown.7". This patch set enables arm64 to make use of the same keyrings as x86 to verify the signature kexec'ed kernel image. Fixes: 732b7b93d849 ("arm64: kexec_file: add kernel signature verification support") Cc: stable@vger.kernel.org # 34d5960af253: kexec: clean up arch_kexec_kernel_verify_sig Cc: stable@vger.kernel.org # 83b7bb2d49ae: kexec, KEYS: make the code in bzImage64_verify_sig generic Acked-by: Baoquan He Cc: kexec@lists.infradead.org Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Co-developed-by: Michal Suchanek Signed-off-by: Michal Suchanek Acked-by: Will Deacon Signed-off-by: Coiby Xu --- arch/arm64/kernel/kexec_image.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c index 9ec34690e255..5ed6a585f21f 100644 --- a/arch/arm64/kernel/kexec_image.c +++ b/arch/arm64/kernel/kexec_image.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -130,18 +129,10 @@ static void *image_load(struct kimage *image, return NULL; } -#ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG -static int image_verify_sig(const char *kernel, unsigned long kernel_len) -{ - return verify_pefile_signature(kernel, kernel_len, NULL, - VERIFYING_KEXEC_PE_SIGNATURE); -} -#endif - const struct kexec_file_ops kexec_image_ops = { .probe = image_probe, .load = image_load, #ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG - .verify_sig = image_verify_sig, + .verify_sig = kexec_kernel_verify_pe_sig, #endif }; From patchwork Mon Jul 4 01:52:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 12904570 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 54AC4C433EF for ; Mon, 4 Jul 2022 01:54:49 +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=PV68GvftgQ+ubKITGLzMLax2UQUuXNM/Zznn41D0Ymo=; b=lFtlzmu4zuEI0R DBwQiTBZMNQ4me6BtwSwRRL7sXm2IYxzRmMQKBlj4XmI1p66p5p+asYErXciQO7qlHIrXOgNPyY2u q4fNLOVyeBR0G4SWCdJ4ZZmcAJDQqQiLTnHWFS9NufEd4oTnfBuFtlK2sKaLybOhzm0R5p1MIal+T T8cLis0c5OM50hzPwkh8k7Apivi+2ccIWdoVTstGBarvlycKZXn8LwdTHwcUv2fQtwzkVJRC7MnAR 29aSmcyjdegRoM8WOUJSEQLPCv/n6vkBlE33P4vMjF6uHQgQxogJFjylwXrNa94l3SHMvr0mSeLay LPtxxBy5koGOJ1SiVXVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8BH7-0038DA-Eq; Mon, 04 Jul 2022 01:53:22 +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 1o8BGj-0037kk-0j for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 01:52:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656899576; 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=Sd8cjBSOdeaVjyH4f3lxl+0xYw15nzSjwpJw6bzSgLk=; b=RSFnfqS9sfBO3KyufXMdhkgYE6J/y0DKoBoeurHoCal5oubM35VrEP5Rl80BdkTNtKtdJp hO4Sw7zFgeuYZNmgX+8j6xJkOcAXYKMSUcuxvwP9z2sWibS8Yeb9psr6QiavjhPi9iDwFh RELl+2ZyiCx2hNWt0DF4rPBrFf5dmeA= 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-203--CTw02FSPci1Dgyjy7koJg-1; Sun, 03 Jul 2022 21:52:55 -0400 X-MC-Unique: -CTw02FSPci1Dgyjy7koJg-1 Received: by mail-pj1-f69.google.com with SMTP id gq11-20020a17090b104b00b001ed2625f43eso3878363pjb.0 for ; Sun, 03 Jul 2022 18:52:54 -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=Sd8cjBSOdeaVjyH4f3lxl+0xYw15nzSjwpJw6bzSgLk=; b=fQ6buazZP6L/zZJaTMr2aDYDYjDE47kpifb9+rwFN8vLxzwffWYN6xYWGdYbSzqW/i IqcKU8Ofif7jwR4ZdiWV3oN/Pyai7Xs7ihrBiR6f1zfqOeamSWeOxR7WJh9ZdxJBV6My kFojgSndWnGkVrWNDOqMkXnMkZAxtFR06UfrSZpNquPnM86Llgq3rl9YEc7v12GHHqnv IVytbG2BxbeYLwC8OM6Qb0nyYKUXjrOiKe50VKl+aIr3Tuilt14Gq8VQ9sxGKG3tMEAW yVsSrM8Mv1aNG/zaaQDCXIb7+8lnmJWF6XLasOEEa8rYs+tJ7BPjiTrv7DcbVjbXe+t9 lliw== X-Gm-Message-State: AJIora92YN+CCmyOf//2QWnVLGbkCsyjZ+Z44JxIuZEcMhsFw+/BHmSC Rw1RHKAVYHGFuDRyQSbyb/3sk31NRyL4tdTob+RcRvfceDVw/yLlSBLx+PEikSLiEvvKSIoJYOs dUFqKrVtDwetC5+9q99eEDCJRr3xXvAbW/K8= X-Received: by 2002:a17:90a:1485:b0:1ec:788e:a053 with SMTP id k5-20020a17090a148500b001ec788ea053mr31016133pja.16.1656899573984; Sun, 03 Jul 2022 18:52:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u8Sm73HYl29mcEbEmk3Z6a37A8y2OdP5f3idLICxDPGrBoxyTSHxhDRsHAFrxMwDkh5wCuzQ== X-Received: by 2002:a17:90a:1485:b0:1ec:788e:a053 with SMTP id k5-20020a17090a148500b001ec788ea053mr31016116pja.16.1656899573776; Sun, 03 Jul 2022 18:52:53 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p2-20020a1709027ec200b00168f08d0d12sm16841927plb.89.2022.07.03.18.52.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 18:52:53 -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, Philipp Rudo , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Martin Schwidefsky , linux-s390@vger.kernel.org (open list:S390), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 4/4] kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification Date: Mon, 4 Jul 2022 09:52:01 +0800 Message-Id: <20220704015201.59744-5-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_185257_246707_3459B1AE X-CRM114-Status: GOOD ( 13.06 ) 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 From: Michal Suchanek commit e23a8020ce4e ("s390/kexec_file: Signature verification prototype") adds support for KEXEC_SIG verification with keys from platform keyring but the built-in keys and secondary keyring are not used. Add support for the built-in keys and secondary keyring as x86 does. Fixes: e23a8020ce4e ("s390/kexec_file: Signature verification prototype") Cc: stable@vger.kernel.org Cc: Philipp Rudo Cc: kexec@lists.infradead.org Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Signed-off-by: Michal Suchanek Reviewed-by: "Lee, Chun-Yi" Acked-by: Baoquan He Signed-off-by: Coiby Xu --- arch/s390/kernel/machine_kexec_file.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c index 8f43575a4dd3..fc6d5f58debe 100644 --- a/arch/s390/kernel/machine_kexec_file.c +++ b/arch/s390/kernel/machine_kexec_file.c @@ -31,6 +31,7 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1; struct module_signature *ms; unsigned long sig_len; + int ret; /* Skip signature verification when not secure IPLed. */ if (!ipl_secure_flag) @@ -65,11 +66,18 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) return -EBADMSG; } - return verify_pkcs7_signature(kernel, kernel_len, - kernel + kernel_len, sig_len, - VERIFY_USE_PLATFORM_KEYRING, - VERIFYING_MODULE_SIGNATURE, - NULL, NULL); + ret = verify_pkcs7_signature(kernel, kernel_len, + kernel + kernel_len, sig_len, + VERIFY_USE_SECONDARY_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) + ret = verify_pkcs7_signature(kernel, kernel_len, + kernel + kernel_len, sig_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + return ret; } #endif /* CONFIG_KEXEC_SIG */