From: Jinjie Ruan <ruanjinjie@huawei.com>
To: <corbet@lwn.net>, <skhan@linuxfoundation.org>,
<catalin.marinas@arm.com>, <will@kernel.org>,
<chenhuacai@kernel.org>, <kernel@xen0n.name>,
<maddy@linux.ibm.com>, <mpe@ellerman.id.au>, <npiggin@gmail.com>,
<chleroy@kernel.org>, <pjw@kernel.org>, <palmer@dabbelt.com>,
<aou@eecs.berkeley.edu>, <alex@ghiti.fr>, <tglx@kernel.org>,
<mingo@redhat.com>, <bp@alien8.de>, <dave.hansen@linux.intel.com>,
<hpa@zytor.com>, <robh@kernel.org>, <saravanak@kernel.org>,
<akpm@linux-foundation.org>, <bhe@redhat.com>,
<vgoyal@redhat.com>, <dyoung@redhat.com>, <rdunlap@infradead.org>,
<peterz@infradead.org>, <pawan.kumar.gupta@linux.intel.com>,
<feng.tang@linux.alibaba.com>, <dapeng1.mi@linux.intel.com>,
<kees@kernel.org>, <elver@google.com>, <paulmck@kernel.org>,
<lirongqing@baidu.com>, <ruanjinjie@huawei.com>,
<rppt@kernel.org>, <ardb@kernel.org>, <leitao@debian.org>,
<osandov@fb.com>, <cfsworks@gmail.com>, <tangyouling@kylinos.cn>,
<sourabhjain@linux.ibm.com>, <ritesh.list@gmail.com>,
<eajames@linux.ibm.com>, <songshuaishuai@tinylab.org>,
<kevin.brodsky@arm.com>, <samuel.holland@sifive.com>,
<vishal.moola@gmail.com>, <junhui.liu@pigmoral.tech>,
<coxu@redhat.com>, <liaoyuanhong@vivo.com>, <jbohac@suse.cz>,
<fuqiang.wang@easystack.cn>, <guoren@kernel.org>,
<chenjiahao16@huawei.com>, <hbathini@linux.ibm.com>,
<james.morse@arm.com>, <takahiro.akashi@linaro.org>,
<lizhengyu3@huawei.com>, <x86@kernel.org>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<loongarch@lists.linux.dev>, <linuxppc-dev@lists.ozlabs.org>,
<linux-riscv@lists.infradead.org>, <devicetree@vger.kernel.org>,
<kexec@lists.infradead.org>
Subject: [PATCH v10 8/8] crash: Fix race condition between crash kernel loading and memory hotplug
Date: Wed, 25 Mar 2026 10:59:04 +0800 [thread overview]
Message-ID: <20260325025904.2811960-9-ruanjinjie@huawei.com> (raw)
In-Reply-To: <20260325025904.2811960-1-ruanjinjie@huawei.com>
There is a race condition between the kexec_load() system call
(crash kernel loading path) and memory hotplug operations that can lead
to buffer overflow and potential kernel crash.
During crash_prepare_headers(), the following steps occur:
1. arch_get_system_nr_ranges() queries current memory ranges from memblock
2. alloc_cmem() allocates buffer based on queried count
3. arch_crash_populate_cmem() populates ranges from memblock
If memory hotplug occurs between step 1 and step 3, the number of ranges
can increase, causing out-of-bounds write when populating cmem->ranges[].
This happens because kexec_load() uses kexec_trylock (atomic_t) while
memory hotplug uses device_hotplug_lock (mutex), so they don't serialize
with each other.
Fix by adding lock_device_hotplug()/unlock_device_hotplug() around the
critical section in crash_prepare_headers(). The lock is only acquired
when CONFIG_MEMORY_HOTPLUG is enabled to avoid overhead on systems without
hotplug support.
Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call")
Fixes: 3751e728cef2 ("arm64: kexec_file: add crash dump support")
Fixes: 8acea455fafa ("RISC-V: Support for kexec_file on panic")
Fixes: 1bcca8620a91 ("LoongArch: Add crash dump support for kexec_file")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
kernel/crash_core.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 300d44ad5471..f01d03d42c67 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -326,15 +326,25 @@ int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz,
struct crash_mem *cmem;
int ret;
+ if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG))
+ lock_device_hotplug();
+
max_nr_ranges = arch_get_system_nr_ranges();
- if (!max_nr_ranges)
- return -ENOMEM;
+ if (!max_nr_ranges) {
+ ret = -ENOMEM;
+ goto unlock;
+ }
cmem = alloc_cmem(max_nr_ranges);
- if (!cmem)
- return -ENOMEM;
+ if (!cmem) {
+ ret = -ENOMEM;
+ goto unlock;
+ }
ret = arch_crash_populate_cmem(cmem);
+ if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG))
+ unlock_device_hotplug();
+
if (ret)
goto out;
@@ -355,6 +365,12 @@ int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz,
out:
kvfree(cmem);
return ret;
+
+unlock:
+ if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG))
+ unlock_device_hotplug();
+
+ return ret;
}
/**
--
2.34.1
next prev parent reply other threads:[~2026-03-25 2:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-25 2:58 [PATCH v10 0/8] arm64/riscv: Add support for crashkernel CMA reservation Jinjie Ruan
2026-03-25 2:58 ` [PATCH v10 1/8] riscv: kexec_file: Fix crashk_low_res not exclude bug Jinjie Ruan
2026-03-25 2:58 ` [PATCH v10 2/8] powerpc/crash: Fix possible memory leak in update_crash_elfcorehdr() Jinjie Ruan
2026-03-25 2:58 ` [PATCH v10 3/8] powerpc/crash: sort crash memory ranges before preparing elfcorehdr Jinjie Ruan
2026-03-25 2:59 ` [PATCH v10 4/8] crash: Exclude crash kernel memory in crash core Jinjie Ruan
2026-03-26 10:53 ` Catalin Marinas
2026-03-25 2:59 ` [PATCH v10 5/8] crash: Use crash_exclude_core_ranges() on powerpc Jinjie Ruan
2026-03-25 2:59 ` [PATCH v10 6/8] arm64: kexec: Add support for crashkernel CMA reservation Jinjie Ruan
2026-03-26 10:54 ` Catalin Marinas
2026-03-25 2:59 ` [PATCH v10 7/8] riscv: " Jinjie Ruan
2026-03-25 2:59 ` Jinjie Ruan [this message]
2026-03-26 4:00 ` [PATCH v10 0/8] arm64/riscv: " Andrew Morton
2026-03-26 13:09 ` Jinjie Ruan
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=20260325025904.2811960-9-ruanjinjie@huawei.com \
--to=ruanjinjie@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=ardb@kernel.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=cfsworks@gmail.com \
--cc=chenhuacai@kernel.org \
--cc=chenjiahao16@huawei.com \
--cc=chleroy@kernel.org \
--cc=corbet@lwn.net \
--cc=coxu@redhat.com \
--cc=dapeng1.mi@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dyoung@redhat.com \
--cc=eajames@linux.ibm.com \
--cc=elver@google.com \
--cc=feng.tang@linux.alibaba.com \
--cc=fuqiang.wang@easystack.cn \
--cc=guoren@kernel.org \
--cc=hbathini@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=jbohac@suse.cz \
--cc=junhui.liu@pigmoral.tech \
--cc=kees@kernel.org \
--cc=kernel@xen0n.name \
--cc=kevin.brodsky@arm.com \
--cc=kexec@lists.infradead.org \
--cc=leitao@debian.org \
--cc=liaoyuanhong@vivo.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lirongqing@baidu.com \
--cc=lizhengyu3@huawei.com \
--cc=loongarch@lists.linux.dev \
--cc=maddy@linux.ibm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=osandov@fb.com \
--cc=palmer@dabbelt.com \
--cc=paulmck@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=pjw@kernel.org \
--cc=rdunlap@infradead.org \
--cc=ritesh.list@gmail.com \
--cc=robh@kernel.org \
--cc=rppt@kernel.org \
--cc=samuel.holland@sifive.com \
--cc=saravanak@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=songshuaishuai@tinylab.org \
--cc=sourabhjain@linux.ibm.com \
--cc=takahiro.akashi@linaro.org \
--cc=tangyouling@kylinos.cn \
--cc=tglx@kernel.org \
--cc=vgoyal@redhat.com \
--cc=vishal.moola@gmail.com \
--cc=will@kernel.org \
--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