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 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 10421C021B3 for ; Tue, 18 Feb 2025 22:56:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yEQ6D0jPp3L3J2bEINRUhp9tW2ZdTFCKcOsBECh74EQ=; b=075w1SssoYnx0c/PxlOkhFALBo 7t1oUSrSdS6UjMpxaYyXchKF436YUgXabwerqNCOSpD1ywngg4m+/jo4mdYk031PgHq+J3/EcF841 rsreUB8Sbp7/+lDJOl0/bJCsbxvFZSRPekDLcHiuSI/yNJcwVXlZD7a3MFB4ITvpiAGcHlqxpiGTH prj2xbNjByg0Gj6LekHn0guTGkAyOVzZSdGB/adgyMICwcPKZFF+hoEfby4dOh/BQ0fsVyncFoqW4 GFLZ1ZhBleWe1HdxP9Bl8N0DYwPBe+WDl7oEa5LgTilJJ807Rre8Pftzm8ssDCAI72ByBEnQjcc+6 eciqbTVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkWW6-0000000ACaf-3HKw; Tue, 18 Feb 2025 22:56:38 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkWUp-0000000ACHa-0Xjj for kexec@bombadil.infradead.org; Tue, 18 Feb 2025 22:55:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=yEQ6D0jPp3L3J2bEINRUhp9tW2ZdTFCKcOsBECh74EQ=; b=HjfncuMQuMmDFTZDGjBEaQyPb8 AR/GDTCir7GOHjOgXQNJ4++4aAY/swa9i4fTU+MToyhpZ2sW2iIDR3GvvMwmTVKzkC8dACKzAKmht QUX2pFE9fZ5TRaVkxGfG/SpLcBTNr3CFQ2KnDArt4MuR2q63a1ghWnXLPEJ6pB6yiQkIrxDryiwry 7Fg6HLOsQHyjDcCc/deYcN+bJ5OKJsN3W+s+BAWxYEiJuWXEoxGSvUe8BDjPdXzXbMJAoOGOiOhFF ho5ttUogyKVtNzKDOV5Je9JyzOdbuUK1mxNlqWCjKOVJL1ZzGweoXsiPtWaWKhtKF0GxI4gDsB/Ss bkSRcy9g==; Received: from linux.microsoft.com ([13.77.154.182]) by desiato.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkWUl-000000024Jx-2s5p for kexec@lists.infradead.org; Tue, 18 Feb 2025 22:55:17 +0000 Received: from localhost.localdomain (unknown [167.220.59.4]) by linux.microsoft.com (Postfix) with ESMTPSA id 8F6BF20376F1; Tue, 18 Feb 2025 14:55:10 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8F6BF20376F1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1739919310; bh=yEQ6D0jPp3L3J2bEINRUhp9tW2ZdTFCKcOsBECh74EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jtl3+RccFqa9UF7YP8AJDZGr66/0lcz9LQptypNuOYSfF9axKxwnYH/OzlZqAd4H9 aZEDef1xyjWWDhxfiY7aI6t7RDl46xxHgoxlMcRHq8j+5YZvMMuZ8nSX8v31emrUHs 7wg4AyaFvTRVw5vm0fY94iWWo0oufUQdxgQ5+Ok4= From: steven chen To: zohar@linux.ibm.com, stefanb@linux.ibm.com, roberto.sassu@huaweicloud.com, roberto.sassu@huawei.com, eric.snowberg@oracle.com, ebiederm@xmission.com, paul@paul-moore.com, code@tyhicks.com, bauermann@kolabnow.com, linux-integrity@vger.kernel.org, kexec@lists.infradead.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Cc: madvenka@linux.microsoft.com, nramas@linux.microsoft.com, James.Bottomley@HansenPartnership.com, bhe@redhat.com, vgoyal@redhat.com, dyoung@redhat.com Subject: [PATCH v8 5/7] ima: kexec: move IMA log copy from kexec load to execute Date: Tue, 18 Feb 2025 14:55:00 -0800 Message-Id: <20250218225502.747963-6-chenste@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250218225502.747963-1-chenste@linux.microsoft.com> References: <20250218225502.747963-1-chenste@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_225516_133360_33C631EB X-CRM114-Status: GOOD ( 18.85 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org ima_dump_measurement_list() is called during kexec 'load', which may result in loss of IMA measurements during kexec soft reboot. It needs to be called during kexec 'execute'. This patch includes the following changes: - Implement kimage_file_post_load() function to be invoked after the new Kernel image has been loaded for kexec. - Call kimage_file_post_load() from kexec_file_load() syscall only for kexec soft reboot scenarios and not for KEXEC_FILE_ON_CRASH. It will map the IMA segment, and register reboot notifier for the function ima_update_kexec_buffer() which would copy the IMA log at kexec soft reboot. - Make kexec_segment_size variable local static to the file, for it to be accessible both during kexec 'load' and 'execute'. - Move ima_dump_measurement_list() call from ima_add_kexec_buffer() to ima_update_kexec_buffer(). - Remove ima_reset_kexec_file() call from ima_add_kexec_buffer(), now that the buffer is being copied at kexec 'execute', and resetting the file at kexec 'load' will corrupt the buffer. Signed-off-by: Tushar Sugandhi Signed-off-by: steven chen --- kernel/kexec_file.c | 8 ++++++ security/integrity/ima/ima_kexec.c | 43 +++++++++++++++++++----------- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 606132253c79..76b6a877b842 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -201,6 +201,11 @@ kimage_validate_signature(struct kimage *image) } #endif +static void kimage_file_post_load(struct kimage *image) +{ + ima_kexec_post_load(image); +} + /* * In file mode list of segments is prepared by kernel. Copy relevant * data from user space, do error checking, prepare segment list @@ -428,6 +433,9 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, kimage_terminate(image); + if (!(flags & KEXEC_FILE_ON_CRASH)) + kimage_file_post_load(image); + ret = machine_kexec_post_load(image); if (ret) goto out; diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 0fa65f91414b..f9dd7ff95b84 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -19,6 +19,7 @@ #ifdef CONFIG_IMA_KEXEC static struct seq_file ima_kexec_file; static void *ima_kexec_buffer; +static size_t kexec_segment_size; static bool ima_kexec_update_registered; static void ima_reset_kexec_file(struct seq_file *sf) @@ -129,7 +130,6 @@ void ima_add_kexec_buffer(struct kimage *image) /* use more understandable variable names than defined in kbuf */ void *kexec_buffer = NULL; size_t kexec_buffer_size = 0; - size_t kexec_segment_size; int ret; /* @@ -154,13 +154,6 @@ void ima_add_kexec_buffer(struct kimage *image) return; } - ret = ima_dump_measurement_list(&kexec_buffer_size, &kexec_buffer, - kexec_segment_size); - if (ret < 0) { - pr_err("Failed to dump IMA measurements. Error:%d.\n", ret); - return; - } - kbuf.buffer = kexec_buffer; kbuf.bufsz = kexec_buffer_size; kbuf.memsz = kexec_segment_size; @@ -178,12 +171,6 @@ void ima_add_kexec_buffer(struct kimage *image) image->ima_segment_index = image->nr_segments - 1; image->is_ima_segment_index_set = true; - /* - * kexec owns kexec_buffer after kexec_add_buffer() is called - * and it will vfree() that buffer. - */ - ima_reset_kexec_file(&ima_kexec_file); - kexec_dprintk("kexec measurement buffer for the loaded kernel at 0x%lx.\n", kbuf.mem); } @@ -194,7 +181,33 @@ void ima_add_kexec_buffer(struct kimage *image) static int ima_update_kexec_buffer(struct notifier_block *self, unsigned long action, void *data) { - return NOTIFY_OK; + void *buf = NULL; + size_t buf_size = 0; + int ret = NOTIFY_OK; + + if (!kexec_in_progress) { + pr_info("No kexec in progress.\n"); + return ret; + } + + if (!ima_kexec_buffer) { + pr_err("Kexec buffer not set.\n"); + return ret; + } + + ret = ima_dump_measurement_list(&buf_size, &buf, + kexec_segment_size); + + if (ret) + pr_err("Dump measurements failed. Error:%d\n", ret); + + if (buf_size != 0) + memcpy(ima_kexec_buffer, buf, buf_size); + + kimage_unmap_segment(ima_kexec_buffer); + ima_kexec_buffer = NULL; + + return ret; } struct notifier_block update_buffer_nb = { -- 2.25.1