Devicetree
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Jinjie Ruan" <ruanjinjie@huawei.com>
Cc: robh@kernel.org, devicetree@vger.kernel.org, conor+dt@kernel.org
Subject: Re: [PATCH v15 12/23] arm64: kexec_file: Fix TOCTOU buffer overflow via memory region padding
Date: Mon, 01 Jun 2026 10:48:21 +0000	[thread overview]
Message-ID: <20260601104821.9283C1F00893@smtp.kernel.org> (raw)
In-Reply-To: <20260601094805.2928614-13-ruanjinjie@huawei.com>

Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:

New issues:
- [High] The newly added bounds check allows the loop to consume slots explicitly reserved for post-loop crashkernel exclusions, leading to an -ENOMEM failure instead of the intended -EAGAIN retry.

Pre-existing issues:
- [Critical] Lockless traversal of memblock regions using `for_each_mem_range()` without holding memory hotplug locks leaves a pre-existing Use-After-Free (UAF) vulnerability unmitigated.
--

commit a57099609b29f69b5cdb1aca8c6ba0cda12c085a
Author: Jinjie Ruan <ruanjinjie@huawei.com>

arm64: kexec_file: Fix TOCTOU buffer overflow via memory region padding

Sashiko AI code review pointed out there is a TOCTOU (Time-of-Check to
Time-of-Use) race condition in prepare_elf_headers() between the initial
pass that counts System RAM ranges and the second pass that populates them.
If a memory hotplug event occurs between these two steps, the number of
memory regions may increase, causing an out-of-bounds write to
the cmem->ranges[] array.

> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index 4cbb71e1f8ed5..8a96fb68b88d6 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -48,7 +48,8 @@ int prepare_elf_headers(void **addr, unsigned long *sz)
>  	u64 i;
>  	phys_addr_t start, end;
>  
> -	nr_ranges = 2; /* for exclusion of crashkernel region */
> +	/* for exclusion of crashkernel region */
> +	nr_ranges = 2 + CRASH_HOTPLUG_SAFETY_PADDING;
>  	for_each_mem_range(i, &start, &end)
>  		nr_ranges++;
>  
> @@ -59,6 +60,11 @@ int prepare_elf_headers(void **addr, unsigned long *sz)
>  	cmem->max_nr_ranges = nr_ranges;
>  	cmem->nr_ranges = 0;
>  	for_each_mem_range(i, &start, &end) {
        ^^^^^^^^^^^^^^^^^^

[Severity: Critical]
This is a pre-existing issue, but does locklessly traversing memblock regions
here leave a use-after-free window during concurrent memory hotplug?

Since this path only holds kexec_mutex and not get_online_mems(), concurrent
memory hotplug events like add_memory() can trigger memblock_add().

If the memblock regions array is full, memblock_double_array() will allocate
a new array and free the old one by calling kfree(old_array).

Could this concurrent free cause the internal memblock traversal logic in
__next_mem_range() to dereference a freed type->regions pointer?

> +		if (unlikely(cmem->nr_ranges >= cmem->max_nr_ranges)) {
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

[Severity: High]
Does this bounds check allow memory hotplug region expansion to consume the
slots explicitly reserved for crashkernel exclusion?

Because nr_ranges initially reserved 2 slots for exclusion, if hotplug
expands the regions and consumes those slots, this check won't fail because
we haven't hit cmem->max_nr_ranges yet.

If the loop completes having consumed these reserved slots, subsequent calls
to crash_exclude_mem_range() will hit their internal limit:

    if (mem->nr_ranges == mem->max_nr_ranges)
        return -ENOMEM;

This returns -ENOMEM instead of the intended -EAGAIN retry, which aborts the
kexec load entirely.

Should this evaluate against cmem->max_nr_ranges - 2?

> +			ret = -EAGAIN;
> +			goto out;
> +		}
> +
>  		cmem->ranges[cmem->nr_ranges].start = start;
>  		cmem->ranges[cmem->nr_ranges].end = end - 1;
>  		cmem->nr_ranges++;

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260601094805.2928614-1-ruanjinjie@huawei.com?part=12

  reply	other threads:[~2026-06-01 10:48 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-01  9:47 [PATCH v15 00/23] arm64/riscv: Add support for crashkernel CMA reservation Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 01/23] riscv: kexec_file: Fix crashk_low_res not exclude bug Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 02/23] powerpc/crash: Fix possible memory leak in update_crash_elfcorehdr() Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 03/23] powerpc/kexec_file: Fix NULL pointer dereference in kexec_extra_fdt_size_ppc64() Jinjie Ruan
2026-06-01 10:00   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 04/23] powerpc/kexec_file: Fix memory range truncation in __merge_memory_ranges() Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 05/23] powerpc/crash: sort crash memory ranges before preparing elfcorehdr Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 06/23] kexec: Extract kexec_free_segment_cma() from kimage_free_cma() Jinjie Ruan
2026-06-01 10:15   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 07/23] arm64: kexec_file: Fix CMA page leaks during segment placement retry loops Jinjie Ruan
2026-06-01 10:19   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 08/23] arm64: kexec_file: Fix image->elf_headers memory leak during retry loop Jinjie Ruan
2026-06-01 10:21   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 09/23] kexec: Fix UAF and Double Free in crash_load_dm_crypt_keys() Jinjie Ruan
2026-06-01 10:29   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 10/23] crash_core: Introduce CRASH_HOTPLUG_SAFETY_PADDING for memory hotplug safety Jinjie Ruan
2026-06-01 10:37   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 11/23] x86: kexec_file: Fix TOCTOU buffer overflow via memory region padding Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 12/23] arm64: " Jinjie Ruan
2026-06-01 10:48   ` sashiko-bot [this message]
2026-06-01  9:47 ` [PATCH v15 13/23] riscv: " Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 14/23] LoongArch: " Jinjie Ruan
2026-06-01 10:51   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 15/23] crash: Add crash_prepare_headers() to exclude crash kernel memory Jinjie Ruan
2026-06-01 10:57   ` sashiko-bot
2026-06-01  9:47 ` [PATCH v15 16/23] arm64: kexec_file: Use crash_prepare_headers() helper to simplify code Jinjie Ruan
2026-06-01  9:47 ` [PATCH v15 17/23] x86: " Jinjie Ruan
2026-06-01  9:48 ` [PATCH v15 18/23] riscv: " Jinjie Ruan
2026-06-01  9:48 ` [PATCH v15 19/23] LoongArch: " Jinjie Ruan
2026-06-01  9:48 ` [PATCH v15 20/23] powerpc/kexec_file: Use crash_exclude_core_ranges() helper Jinjie Ruan
2026-06-01  9:48 ` [PATCH v15 21/23] arm64: kexec_file: Add support for crashkernel CMA reservation Jinjie Ruan
2026-06-01  9:48 ` [PATCH v15 22/23] riscv: " Jinjie Ruan
2026-06-01  9:48 ` [PATCH v15 23/23] arm64: crash: Add crash hotplug support Jinjie Ruan
2026-06-01 11:37   ` sashiko-bot
2026-06-01 13:40 ` [PATCH v15 00/23] arm64/riscv: Add support for crashkernel CMA reservation Baoquan He

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=20260601104821.9283C1F00893@smtp.kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=ruanjinjie@huawei.com \
    --cc=sashiko-reviews@lists.linux.dev \
    /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