Commit 27966721 authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Will Deacon

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: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent c7777236
...@@ -87,7 +87,9 @@ static int setup_dtb(struct kimage *image, ...@@ -87,7 +87,9 @@ static int setup_dtb(struct kimage *image,
/* add kaslr-seed */ /* add kaslr-seed */
ret = fdt_delprop(dtb, off, FDT_PROP_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; goto out;
if (rng_is_initialized()) { if (rng_is_initialized()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment