Skip to content

kernel probe function fixes

Dave Young kexec 1 version Applied

Status from this message: Thanks, applied.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 2 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/2zImage_ppc64_probe: return 0 instead of 1 in case of successkexec/arch/ppc64/kexec-zImage-ppc64.c+4 -11 reply
2/2kernel image probe function return value checking fixkexec/kexec.c+1 -11 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] kernel probe function fixes

During my testing for arm zImage, in 2nd kernel the atags pointer and the machine_id are not valid, I did a lot of debugging in kernel, finally I found this is caused by a kexec tools bug instead.

It is a regression since bf06cf2095. It changes uImage probe return values as below:
* 0 - valid uImage type
* -1 - If the image is corrupted.
* 1 - If the image is not a uImage.

Because uImage will be probed before zImage, but the uImage probe return 1 for a zImage thus kexec will mistakenly think it is ok to use as uImage.

IMHO, return -1 in case it's not an uImage is better instead of 1 like before It's not really necessary to introduce a new return value. It might be better for a new patch to return either 0 or -1 for uImage probe.

But I did not fix the uImage return value yet. In this patchset I did below:
- ppc64 zImage: return 0 instead of 1 in case of success
- strictly checking if probe return 0 in kexec.c

Tested arm zImage with use_atags only.

Dave Young (2):
zImage_ppc64_probe: return 0 instead of 1 in case of success kernel image probe function return value checking fix

 kexec/arch/ppc64/kexec-zImage-ppc64.c | 5 ++++-
 kexec/kexec.c                         | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
Signature · 7 lines
1.8.3.1


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec