diff options
| author | Jean-Philippe Brucker <jean-philippe.brucker@arm.com> | 2019-02-01 15:50:28 +0000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2019-02-05 15:24:17 +0100 |
| commit | f1f2f9edf8d4c5294e30f20546c5177ab59e53a2 (patch) | |
| tree | 64373a5233dd018ac7da7a18ec56ea75ab1635ef /kexec/arch | |
| parent | c493af72ac796e8ab3f3f4299205bd402dcee861 (diff) | |
arm64: wipe old initrd addresses when patching the DTB
When copying the DTB from the current kernel, if the user didn't pass an
initrd on the command-line, make sure that the new DTB doesn't contain
initrd properties with stale addresses. Otherwise the next kernel will
try to unpack the initramfs from a location that contains junk, since
the initial initrd is long gone:
[ 49.370026] Initramfs unpacking failed: junk in compressed archive
This issue used to be hidden by a successful recovery, but since commit
ff1522bb7d98 ("initramfs: cleanup incomplete rootfs") in Linux, the
kernel removes the default /root mountpoint after failing to load an
initramfs, and cannot mount the rootfs passed on the command-line
anymore.
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch')
| -rw-r--r-- | kexec/arch/arm64/kexec-arm64.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c index 1cde75d..2992bce 100644 --- a/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c @@ -713,6 +713,11 @@ int arm64_load_other_segments(struct kexec_info *info, } } + if (!initrd_buf) { + /* Don't reuse the initrd addresses from 1st DTB */ + dtb_clear_initrd((char **)&dtb.buf, &dtb.size); + } + /* Check size limit as specified in booting.txt. */ if (dtb.size > MiB(2)) { |