ima: verify the previous kernel's IMA buffer lies in addressable RAM
PATCH 1/3 ima: verify the previous kernel's IMA buffer lies in addressable RAM
From: Harshit Mogalapalli <[email protected]>
[ Upstream commit 10d1c75ed4382a8e79874379caa2ead8952734f9 ]
Patch series "Address page fault in ima_restore_measurement_list()", v3.
When the second-stage kernel is booted via kexec with a limiting command line such as "mem=<size>" we observe a pafe fault that happens.
BUG: unable to handle page fault for address: ffff97793ff47000
RIP: ima_restore_measurement_list+0xdc/0x45a
#PF: error_code(0x0000) not-present pageThis happens on x86_64 only, as this is already fixed in aarch64 in
commit: cbf9c4b9617b ("of: check previous kernel's ima-kexec-buffer against memory bounds")
This patch (of 3):
When the second-stage kernel is booted with a limiting command line (e.g. "mem=<size>"), the IMA measurement buffer handed over from the previous kernel may fall outside the addressable RAM of the new kernel. Accessing such a buffer can fault during early restore.
Introduce a small generic helper, ima_validate_range(), which verifies that a physical [start, end] range for the previous-kernel IMA buffer lies within addressable memory:
- On x86, use pfn_range_is_mapped().
- On OF based architectures, use page_is_ram().
--- include/linux/ima.h | 1 + security/integrity/ima/ima_kexec.c | 35 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+)
include/linux/ima.h +1 -0
@@ -145,6 +145,7 @@ static inline int ima_measure_critical_data(const char *event_label,#ifdef CONFIG_HAVE_IMA_KEXEC int __init ima_free_kexec_buffer (void );int __init ima_get_kexec_buffer (void **addr,size_t *size); +int ima_validate_range (phys_addr_t phys,size_t size);#endif #ifdef CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT
security/integrity/ima/ima_kexec.c +35 -0
@@ -12,6 +12,8 @@#include <linux/kexec.h> #include <linux/of.h> #include <linux/ima.h> +#include <linux/mm.h> +#include <linux/overflow.h> #include "ima.h" #ifdef CONFIG_IMA_KEXEC
@@ -164,3 +166,36 @@ void __init ima_load_kexec_buffer(void)pr_debug ("Error restoring the measurement list: %d\n" , rc); } } + +/* +* ima_validate_range - verify a physical buffer lies in addressable RAM +* @phys: physical start address of the buffer from previous kernel +* @size: size of the buffer +* +* On success return 0. On failure returns -EINVAL so callers can skip +* restoring. +*/ +int ima_validate_range (phys_addr_t phys,size_t size) +{ +unsigned long start_pfn, end_pfn; +phys_addr_t end_phys; + +if (check_add_overflow (phys, (phys_addr_t )size -1 , &end_phys)) +return -EINVAL ; + + start_pfn =PHYS_PFN (phys); + end_pfn =PHYS_PFN (end_phys); + +#ifdef CONFIG_X86 +if (!pfn_range_is_mapped (start_pfn, end_pfn)) +#else + if (!page_is_ram(start_pfn) || !page_is_ram(end_pfn)) +#endif + { +pr_warn ("IMA: previous kernel measurement buffer %pa (size 0x%zx) lies outside available memory\n" , + &phys, size); +return -EINVAL ; + } + +return 0 ; +}
Signature · 1 line
2.43.0
PATCH 2/3 of/kexec: refactor ima_get_kexec_buffer() to use ima_validate_range()
From: Harshit Mogalapalli <[email protected]>
[ Upstream commit 4d02233235ed0450de9c10fcdcf3484e3c9401ce ]
Refactor the OF/DT ima_get_kexec_buffer() to use a generic helper to validate the address range. No functional change intended.
--- drivers/of/kexec.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/of/kexec.c +3 -12
@@ -128,7 +128,6 @@ int __init ima_get_kexec_buffer(void **addr, size_t *size) {int ret, len;unsigned long tmp_addr; -unsigned long start_pfn, end_pfn;size_t tmp_size;const void *prop;
@@ -144,17 +143,9 @@ int __init ima_get_kexec_buffer(void **addr, size_t *size)if (!tmp_size)return -ENOENT ; -/* -* Calculate the PFNs for the buffer and ensure -* they are with in addressable memory. -*/ - start_pfn =PHYS_PFN (tmp_addr); - end_pfn =PHYS_PFN (tmp_addr + tmp_size -1 ); -if (!page_is_ram (start_pfn) || !page_is_ram (end_pfn)) { -pr_warn ("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n" , - tmp_addr, tmp_size); -return -EINVAL ; - } + ret =ima_validate_range (tmp_addr, tmp_size); +if (ret) +return ret; *addr =__va (tmp_addr); *size = tmp_size;
Signature · 1 line
2.43.0
PATCH 3/3 x86/kexec: add a sanity check on previous kernel's ima kexec buffer
In reply to Wenshan LanFrom: Harshit Mogalapalli <[email protected]>
[ Upstream commit c5489d04337b47e93c0623e8145fcba3f5739efd ]
When the second-stage kernel is booted via kexec with a limiting command line such as "mem=<size>", the physical range that contains the carried over IMA measurement list may fall outside the truncated RAM leading to a kernel panic.
BUG: unable to handle page fault for address: ffff97793ff47000
RIP: ima_restore_measurement_list+0xdc/0x45a
#PF: error_code(0x0000) – not-present pageOther architectures already validate the range with page_is_ram(), as done in commit cbf9c4b9617b ("of: check previous kernel's ima-kexec-buffer against memory bounds") do a similar check on x86.
Without carrying the measurement list across kexec, the attestation would fail.
--- arch/x86/kernel/setup.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kernel/setup.c +6 -0
@@ -372,9 +372,15 @@ int __init ima_free_kexec_buffer(void)int __init ima_get_kexec_buffer (void **addr,size_t *size) { +int ret; +if (!ima_kexec_buffer_size)return -ENOENT ; + ret =ima_validate_range (ima_kexec_buffer_phys, ima_kexec_buffer_size); +if (ret) +return ret; + *addr =__va (ima_kexec_buffer_phys); *size = ima_kexec_buffer_size;
Signature · 1 line
2.43.0
Sasha Levin
maintainerQuoted 6 lines
[PATCH 6.6.y 1/3] ima: verify the previous kernel's IMA buffer lies in addressable RAM
[PATCH 6.6.y 2/3] of/kexec: refactorima_get_kexec_buffer()to useima_validate_range()
[PATCH 6.6.y 3/3] x86/kexec: add a sanity check on previous kernel's ima kexec buffer
All three queued for 6.6.y as an ordered series, thanks. This also resolves the earlier build failure from cherry-picking 3/3 alone (which I'd had to revert) since 1/3 now provides ima_validate_range() ahead of its x86 caller.
Signature · 2 lines
Thanks, Sasha