Skip to content

Commit cbf9c4b

Browse files
vaibhav92robherring
authored andcommitted
of: check previous kernel's ima-kexec-buffer against memory bounds
Presently ima_get_kexec_buffer() doesn't check if the previous kernel's ima-kexec-buffer lies outside the addressable memory range. This can result in a kernel panic if the new kernel is booted with 'mem=X' arg and the ima-kexec-buffer was allocated beyond that range by the previous kernel. The panic is usually of the form below: $ sudo kexec --initrd initrd vmlinux --append='mem=16G' <snip> BUG: Unable to handle kernel data access on read at 0xc000c01fff7f0000 Faulting instruction address: 0xc000000000837974 Oops: Kernel access of bad area, sig: 11 [#1] <snip> NIP [c000000000837974] ima_restore_measurement_list+0x94/0x6c0 LR [c00000000083b55c] ima_load_kexec_buffer+0xac/0x160 Call Trace: [c00000000371fa80] [c00000000083b55c] ima_load_kexec_buffer+0xac/0x160 [c00000000371fb00] [c0000000020512c4] ima_init+0x80/0x108 [c00000000371fb70] [c0000000020514dc] init_ima+0x4c/0x120 [c00000000371fbf0] [c000000000012240] do_one_initcall+0x60/0x2c0 [c00000000371fcc0] [c000000002004ad0] kernel_init_freeable+0x344/0x3ec [c00000000371fda0] [c0000000000128a4] kernel_init+0x34/0x1b0 [c00000000371fe10] [c00000000000ce64] ret_from_kernel_thread+0x5c/0x64 Instruction dump: f92100b8 f92100c0 90e10090 910100a0 4182050c 282a0017 3bc00000 40810330 7c0802a6 fb610198 7c9b2378 f80101d0 <a1240000> 2c090001 40820614 e9240010 ---[ end trace 0000000000000000 ]--- Fix this issue by checking returned PFN range of previous kernel's ima-kexec-buffer with page_is_ram() to ensure correct memory bounds. Fixes: 467d278 ("powerpc: ima: get the kexec buffer passed by the previous kernel") Cc: Frank Rowand <[email protected]> Cc: Prakhar Srivastava <[email protected]> Cc: Lakshmi Ramasubramanian <[email protected]> Cc: Thiago Jung Bauermann <[email protected]> Cc: Rob Herring <[email protected]> Cc: Ritesh Harjani <[email protected]> Cc: Robin Murphy <[email protected]> Signed-off-by: Vaibhav Jain <[email protected]> Signed-off-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f06e4c9 commit cbf9c4b

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

drivers/of/kexec.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ int ima_get_kexec_buffer(void **addr, size_t *size)
126126
{
127127
int ret, len;
128128
unsigned long tmp_addr;
129+
unsigned long start_pfn, end_pfn;
129130
size_t tmp_size;
130131
const void *prop;
131132

@@ -140,6 +141,22 @@ int ima_get_kexec_buffer(void **addr, size_t *size)
140141
if (ret)
141142
return ret;
142143

144+
/* Do some sanity on the returned size for the ima-kexec buffer */
145+
if (!tmp_size)
146+
return -ENOENT;
147+
148+
/*
149+
* Calculate the PFNs for the buffer and ensure
150+
* they are with in addressable memory.
151+
*/
152+
start_pfn = PHYS_PFN(tmp_addr);
153+
end_pfn = PHYS_PFN(tmp_addr + tmp_size - 1);
154+
if (!page_is_ram(start_pfn) || !page_is_ram(end_pfn)) {
155+
pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n",
156+
tmp_addr, tmp_size);
157+
return -EINVAL;
158+
}
159+
143160
*addr = __va(tmp_addr);
144161
*size = tmp_size;
145162

0 commit comments

Comments
 (0)