| Message ID | 20220518200547.655788-1-vaibhav@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc: check previous kernel's ima-kexec-buffer against memory bounds | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 7 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
Hi Vaibhav, On 5/18/2022 1:05 PM, Vaibhav Jain wrote: > 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. Thanks for providing this patch. > Fix this issue by checking returned address/size of previous kernel's > ima-kexec-buffer against memblock's memory bounds. > > Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to > drivers/of/kexec.c") > > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: Prakhar Srivastava <prsriva@linux.microsoft.com> > Cc: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> > --- > drivers/of/kexec.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c > index b9bd1cff1793..c73007eda52d 100644 > --- a/drivers/of/kexec.c > +++ b/drivers/of/kexec.c > @@ -140,6 +140,13 @@ int ima_get_kexec_buffer(void **addr, size_t *size) > if (ret) > return ret; > > + /* if the ima-kexec-buffer goes beyond the addressable memory */ > + if (!memblock_is_region_memory(tmp_addr, tmp_size)) { > + pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n", > + tmp_addr, tmp_size); > + return -EINVAL; > + } > + Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > *addr = __va(tmp_addr); > *size = tmp_size; >
Vaibhav Jain <vaibhav@linux.ibm.com> writes: > > [PATCH] powerpc: check previous kernel's ima-kexec-buffer against memory bounds This isn't a powerpc patch, the subject should start with "of:". > 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 address/size of previous kernel's > ima-kexec-buffer against memblock's memory bounds. > > Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to > drivers/of/kexec.c") > > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: Prakhar Srivastava <prsriva@linux.microsoft.com> > Cc: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> > --- > drivers/of/kexec.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c > index b9bd1cff1793..c73007eda52d 100644 > --- a/drivers/of/kexec.c > +++ b/drivers/of/kexec.c > @@ -140,6 +140,13 @@ int ima_get_kexec_buffer(void **addr, size_t *size) > if (ret) > return ret; > > + /* if the ima-kexec-buffer goes beyond the addressable memory */ > + if (!memblock_is_region_memory(tmp_addr, tmp_size)) { Not all arches keep the memblock info around after boot. I think this will be called too late, but I'd have to check the exact timing to be sure. I think you can use pfn_valid() instead? cheers > + pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n", > + tmp_addr, tmp_size); > + return -EINVAL; > + } > + > *addr = __va(tmp_addr); > *size = tmp_size; > > -- > 2.35.1
On Thu, May 19, 2022 at 01:35:47AM +0530, Vaibhav Jain wrote: > 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 address/size of previous kernel's > ima-kexec-buffer against memblock's memory bounds. > > Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to > drivers/of/kexec.c") Your mailer (and/or you) corrupted this. There should be a space between the commit hash and subject, and it should not be wrapped. It should also not have a blank line here. But more importantly, how did this commit introduce the problem? It just moved the code and didn't have any such check. > > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: Prakhar Srivastava <prsriva@linux.microsoft.com> > Cc: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> > --- > drivers/of/kexec.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c > index b9bd1cff1793..c73007eda52d 100644 > --- a/drivers/of/kexec.c > +++ b/drivers/of/kexec.c > @@ -140,6 +140,13 @@ int ima_get_kexec_buffer(void **addr, size_t *size) > if (ret) > return ret; > > + /* if the ima-kexec-buffer goes beyond the addressable memory */ > + if (!memblock_is_region_memory(tmp_addr, tmp_size)) { > + pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n", > + tmp_addr, tmp_size); > + return -EINVAL; > + } > + > *addr = __va(tmp_addr); > *size = tmp_size; > > -- > 2.35.1 > >
Rob Herring <robh@kernel.org> writes: > On Thu, May 19, 2022 at 01:35:47AM +0530, Vaibhav Jain wrote: >> 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 address/size of previous kernel's >> ima-kexec-buffer against memblock's memory bounds. >> >> Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to >> drivers/of/kexec.c") > > Your mailer (and/or you) corrupted this. There should be a space between > the commit hash and subject, and it should not be wrapped. I probably messed it up. Will resend a fixed patch. > > It should also not have a blank line here. Sure. Will get this fixed > > But more importantly, how did this commit introduce the problem? It just > moved the code and didn't have any such check. Yes, the code didnt have the necessary check to see if the address for previous kernel IMA buffer is beyond the currently addressable memory. I have described the problem in patch description. <snip>
Vaibhav Jain <vaibhav@linux.ibm.com> writes: > Rob Herring <robh@kernel.org> writes: >> On Thu, May 19, 2022 at 01:35:47AM +0530, Vaibhav Jain wrote: >>> 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 address/size of previous kernel's >>> ima-kexec-buffer against memblock's memory bounds. >>> >>> Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to >>> drivers/of/kexec.c") ... >> >> But more importantly, how did this commit introduce the problem? It just >> moved the code and didn't have any such check. > Yes, the code didnt have the necessary check to see if the address for > previous kernel IMA buffer is beyond the currently addressable memory. I > have described the problem in patch description. Rob's point is that commit fee3ff99bc67 only moved existing code, the bug already existed. The function was introduced in: 467d27824920 ("powerpc: ima: get the kexec buffer passed by the previous kernel") So that's where the Fixes tag should point. cheers
Michael Ellerman <mpe@ellerman.id.au> writes: <snip> > > Rob's point is that commit fee3ff99bc67 only moved existing code, the > bug already existed. > > The function was introduced in: > > 467d27824920 ("powerpc: ima: get the kexec buffer passed by the previous kernel") > > So that's where the Fixes tag should point. Thanks Mpe for explaining and apologies Rob as I initially didnt get the point you made. I wrongly assumed that since the patch can only be applied on top of commit fee3ff99bc67 hence fixes should point to fee3ff99bc67. I have sent out a v2 with the updated Fixes tag and also changes as suggested by Mpe and Rob at https://lore.kernel.org/all/20220524055042.1527968-1-vaibhav@linux.ibm.com/
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index b9bd1cff1793..c73007eda52d 100644 --- a/drivers/of/kexec.c +++ b/drivers/of/kexec.c @@ -140,6 +140,13 @@ int ima_get_kexec_buffer(void **addr, size_t *size) if (ret) return ret; + /* if the ima-kexec-buffer goes beyond the addressable memory */ + if (!memblock_is_region_memory(tmp_addr, tmp_size)) { + pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n", + tmp_addr, tmp_size); + return -EINVAL; + } + *addr = __va(tmp_addr); *size = tmp_size;
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 address/size of previous kernel's ima-kexec-buffer against memblock's memory bounds. Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c") Cc: Frank Rowand <frowand.list@gmail.com> Cc: Prakhar Srivastava <prsriva@linux.microsoft.com> Cc: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> --- drivers/of/kexec.c | 7 +++++++ 1 file changed, 7 insertions(+)