diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2019-01-11 10:40:21 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-01-11 13:10:51 +0300 |
| commit | 279667212ab2a4f36c3b0347657ddcc11f9cfa25 (patch) | |
| tree | 7ec07e20c4953b8cfafe41dcc184d94ccd5fe723 /arch/arm64 | |
| parent | c7777236dd8f587f6a8d6800c03df318fd4d2627 (diff) | |
| download | linux-279667212ab2a4f36c3b0347657ddcc11f9cfa25.tar.xz | |
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 884143f60c89 ("arm64: kexec_file: add kaslr support")
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/machine_kexec_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 10e33860e47a..f2c211a6229b 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -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()) { |