From: Coiby Xu <coxu@redhat.com>
To: kexec@lists.infradead.org
Cc: Milan Broz <gmazyland@gmail.com>,
Thomas Staudt <tstaudt@de.ibm.com>,
Kairui Song <ryncsn@gmail.com>,
dm-devel@redhat.com, Jan Pazdziora <jpazdziora@redhat.com>,
Pingfan Liu <kernelfans@gmail.com>, Baoquan He <bhe@redhat.com>,
Dave Young <dyoung@redhat.com>,
linux-kernel@vger.kernel.org, x86@kernel.org,
Dave Hansen <dave.hansen@intel.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 5/5] x86/crash: make the page that stores the LUKS volume key inaccessible
Date: Thu, 1 Jun 2023 15:24:44 +0800 [thread overview]
Message-ID: <20230601072444.2033855-6-coxu@redhat.com> (raw)
In-Reply-To: <20230601072444.2033855-1-coxu@redhat.com>
This adds an addition layer of protection for the saved copy of LUKS
volume key. Trying to access the saved copy will cause page fault.
Suggested-by: Pingfan Liu <kernelfans@gmail.com>
Signed-off-by: Coiby Xu <coxu@redhat.com>
---
arch/x86/kernel/machine_kexec_64.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 1a3e2c05a8a5..82d1ecb35827 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -546,9 +546,23 @@ static void kexec_mark_crashkres(bool protect)
kexec_mark_range(control, crashk_res.end, protect);
}
+static void kexec_mark_luks_volume_key_inaccessible(void)
+{
+ unsigned long start_paddr, end_paddr;
+ unsigned int nr_pages;
+
+ if (kexec_crash_image->luks_volume_key_addr) {
+ start_paddr = kexec_crash_image->luks_volume_key_addr;
+ end_paddr = start_paddr + kexec_crash_image->luks_volume_key_sz - 1;
+ nr_pages = (PAGE_ALIGN(end_paddr) - PAGE_ALIGN_DOWN(start_paddr))/PAGE_SIZE;
+ set_memory_np((unsigned long)phys_to_virt(start_paddr), nr_pages);
+ }
+}
+
void arch_kexec_protect_crashkres(void)
{
kexec_mark_crashkres(true);
+ kexec_mark_luks_volume_key_inaccessible();
}
void arch_kexec_unprotect_crashkres(void)
--
2.40.1
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2023-06-01 7:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 7:24 [PATCH 0/5] Support kdump with LUKS encryption by reusing LUKS volume key Coiby Xu
2023-06-01 7:24 ` [PATCH 1/5] kexec_file: allow to place kexec_buf randomly Coiby Xu
2023-06-01 7:24 ` [PATCH 2/5] crash_dump: save the LUKS volume key temporarily Coiby Xu
2023-06-01 7:24 ` [PATCH 3/5] crash_dump: retrieve LUKS volume key in kdump kernel Coiby Xu
2023-06-01 7:24 ` [PATCH 4/5] x86/crash: pass the LUKS volume key to " Coiby Xu
2023-06-01 7:24 ` Coiby Xu [this message]
2023-06-02 21:34 ` [PATCH 0/5] Support kdump with LUKS encryption by reusing LUKS volume key Eric Biggers
2023-06-03 9:22 ` Milan Broz
2023-06-05 2:31 ` Coiby Xu
2023-06-05 7:09 ` Milan Broz
2023-06-06 11:02 ` Coiby Xu
2023-06-07 6:14 ` Milan Broz
2023-06-07 12:39 ` Coiby Xu
2023-06-08 10:39 ` Milan Broz
2023-06-09 9:58 ` Coiby Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230601072444.2033855-6-coxu@redhat.com \
--to=coxu@redhat.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=dm-devel@redhat.com \
--cc=dyoung@redhat.com \
--cc=gmazyland@gmail.com \
--cc=hpa@zytor.com \
--cc=jpazdziora@redhat.com \
--cc=kernelfans@gmail.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=ryncsn@gmail.com \
--cc=tglx@linutronix.de \
--cc=tstaudt@de.ibm.com \
--cc=vkuznets@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox