From: DaveYoung <dyoung@redhat.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Mike Galbraith <efault@gmx.de>,
Thomas Gleixner <tglx@linutronix.de>,
LKML <linux-kernel@vger.kernel.org>, Baoquan He <bhe@redhat.com>,
kexec@lists.infradead.org, x86@kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [patch] x86/crash: fix crash_setup_memmap_entries() out-of-bounds access
Date: Mon, 19 Apr 2021 17:37:32 +0800 [thread overview]
Message-ID: <20210419093732.GB8618@dhcp-128-65.nay.redhat.com> (raw)
In-Reply-To: <20210419085202.GB9093@zn.tnic>
On 04/19/21 at 10:52am, Borislav Petkov wrote:
> Here's an attempt to explain what this fixes:
>
> ---
> From: Mike Galbraith <efault@gmx.de>
> Date: Fri, 16 Apr 2021 14:02:07 +0200
> Subject: [PATCH] x86/crash: Fix crash_setup_memmap_entries() out-of-bounds
> access
>
> Commit in Fixes: added support for kexec-ing a kernel on panic using a
> new system call. As part of it, it does prepare a memory map for the new
> kernel.
>
> However, while doing so, it wrongly accesses memory it has not
> allocated: it accesses the first element of the cmem->ranges[] array in
> memmap_exclude_ranges() but it has not allocated the memory for it in
> crash_setup_memmap_entries(). As KASAN reports:
>
> BUG: KASAN: vmalloc-out-of-bounds in crash_setup_memmap_entries+0x17e/0x3a0
> Write of size 8 at addr ffffc90000426008 by task kexec/1187
>
> (gdb) list *crash_setup_memmap_entries+0x17e
> 0xffffffff8107cafe is in crash_setup_memmap_entries (arch/x86/kernel/crash.c:322).
> 317 unsigned long long mend)
> 318 {
> 319 unsigned long start, end;
> 320
> 321 cmem->ranges[0].start = mstart;
> 322 cmem->ranges[0].end = mend;
> 323 cmem->nr_ranges = 1;
> 324
> 325 /* Exclude elf header region */
> 326 start = image->arch.elf_load_addr;
> (gdb)
>
> Make sure the ranges array becomes a single element allocated.
>
> [ bp: Write a proper commit message. ]
Reviewed-by: Dave Young <dyoung@redhat.com>
>
> Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call")
> Signed-off-by: Mike Galbraith <efault@gmx.de>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Link: https://lkml.kernel.org/r/725fa3dc1da2737f0f6188a1a9701bead257ea9d.camel@gmx.de
> ---
> arch/x86/kernel/crash.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
> index a8f3af257e26..b1deacbeb266 100644
> --- a/arch/x86/kernel/crash.c
> +++ b/arch/x86/kernel/crash.c
> @@ -337,7 +337,7 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params)
> struct crash_memmap_data cmd;
> struct crash_mem *cmem;
>
> - cmem = vzalloc(sizeof(struct crash_mem));
> + cmem = vzalloc(struct_size(cmem, ranges, 1));
> if (!cmem)
> return -ENOMEM;
>
> --
> 2.29.2
>
> --
> Regards/Gruss,
> Boris.
>
> https://people.kernel.org/tglx/notes-about-netiquette
>
Thanks
Dave
next prev parent reply other threads:[~2021-04-19 9:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 17:56 x86/crash: fix crash_setup_memmap_entries() out-of-bounds access Mike Galbraith
2021-04-16 11:07 ` Dave Young
2021-04-16 11:28 ` Mike Galbraith
2021-04-16 11:47 ` Dave Young
2021-04-16 12:02 ` [patch] " Mike Galbraith
2021-04-16 12:16 ` Borislav Petkov
2021-04-16 13:16 ` Mike Galbraith
2021-04-16 14:44 ` Borislav Petkov
2021-04-16 15:13 ` Mike Galbraith
2021-04-16 21:44 ` Thomas Gleixner
2021-04-17 0:05 ` Mike Galbraith
2021-04-19 8:52 ` Borislav Petkov
2021-04-19 9:37 ` DaveYoung [this message]
2021-04-20 18:00 ` [tip: x86/urgent] x86/crash: Fix " tip-bot2 for Mike Galbraith
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=20210419093732.GB8618@dhcp-128-65.nay.redhat.com \
--to=dyoung@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=efault@gmx.de \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--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;
as well as URLs for NNTP newsgroup(s).