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 can also prepare for the subsequent patch's kexec_core_dbg_print
to be reset to zero 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