From: Qiang Ma <maqianga@uniontech.com>
To: akpm@linux-foundation.org, bhe@redhat.com,
catalin.marinas@arm.com, will@kernel.org
Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Qiang Ma <maqianga@uniontech.com>
Subject: [PATCH v2 1/4] kexec: Replace the goto out_unlock with out
Date: Fri, 19 Dec 2025 17:31:31 +0800 [thread overview]
Message-ID: <20251219093134.2268620-2-maqianga@uniontech.com> (raw)
In-Reply-To: <20251219093134.2268620-1-maqianga@uniontech.com>
The image is initialized to NULL. Then, after calling kimage_alloc_init,
we can directly goto 'out' because at this time, the kimage_free will
determine whether image is a NULL pointer.
This will prepare for the subsequent patch to reset the variable in
kimage_free.
Signed-off-by: Qiang Ma <maqianga@uniontech.com>
---
kernel/kexec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 28008e3d462e..9bb1f2b6b268 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -95,6 +95,8 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments,
unsigned long i;
int ret;
+ image = NULL;
+
/*
* Because we write directly to the reserved memory region when loading
* crash kernels we need a serialization here to prevent multiple crash
@@ -129,7 +131,7 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments,
ret = kimage_alloc_init(&image, entry, nr_segments, segments, flags);
if (ret)
- goto out_unlock;
+ goto out;
if (flags & KEXEC_PRESERVE_CONTEXT)
image->preserve_context = 1;
--
2.20.1
next prev parent reply other threads:[~2025-12-19 9:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-19 9:31 [PATCH v2 0/4] kexec: add kexec flag to control debug printing Qiang Ma
2025-12-19 9:31 ` Qiang Ma [this message]
2025-12-19 9:31 ` [PATCH v2 2/4] " Qiang Ma
2025-12-19 9:31 ` [PATCH v2 3/4] kexec: print out debugging message if required for kexec_load Qiang Ma
2025-12-19 9:31 ` [PATCH v2 4/4] arm64: kexec: Adjust the debug print of kexec_image_info Qiang Ma
2026-01-05 20:41 ` Will Deacon
2026-01-19 23:49 ` [PATCH v2 0/4] kexec: add kexec flag to control debug printing Andrew Morton
2026-01-20 10:15 ` 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=20251219093134.2268620-2-maqianga@uniontech.com \
--to=maqianga@uniontech.com \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=will@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