Commit 27966721 authored Jan 11, 2019 by AKASHI Takahiro Committed by Will Deacon Jan 11, 2019

arm64: kexec_file: return successfully even if kaslr-seed doesn't exist



In kexec_file_load, kaslr-seed property of the current dtb will be deleted
any way before setting a new value if possible. It doesn't matter whether
it exists in the current dtb.

So "ret" should be reset to 0 here.

Fixes: commit 884143f6 ("arm64: kexec_file: add kaslr support")
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent c7777236

arch/arm64/kernel/machine_kexec_file.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,9 @@ static int setup_dtb(struct kimage *image,

		/* add kaslr-seed */
		ret = fdt_delprop(dtb, off, FDT_PROP_KASLR_SEED);
		if (ret && (ret != -FDT_ERR_NOTFOUND))
		if (ret == -FDT_ERR_NOTFOUND)
		ret = 0;
		else if (ret)
		goto out;

		if (rng_is_initialized()) {

Admin message