summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorSteven Price <steven.price@arm.com>2019-05-18 00:31:47 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-01 09:26:09 +0300
commit75448f40b9f6c0fd6d6afdf9101fbb2697fb5608 (patch)
treec53986b0a87bfbd3f474b62b19693cfaf69f8c58 /init
parentad16dfef4a44ba71580af6e5cdc743c4796768ef (diff)
downloadlinux-75448f40b9f6c0fd6d6afdf9101fbb2697fb5608.tar.xz
initramfs: don't free a non-existent initrd
[ Upstream commit 5d59aa8f9ce972b472201aed86e904bb75879ff0 ] Since commit 54c7a8916a88 ("initramfs: free initrd memory if opening /initrd.image fails"), the kernel has unconditionally attempted to free the initrd even if it doesn't exist. In the non-existent case this causes a boot-time splat if CONFIG_DEBUG_VIRTUAL is enabled due to a call to virt_to_phys() with a NULL address. Instead we should check that the initrd actually exists and only attempt to free it if it does. Link: http://lkml.kernel.org/r/20190516143125.48948-1-steven.price@arm.com Fixes: 54c7a8916a88 ("initramfs: free initrd memory if opening /initrd.image fails") Signed-off-by: Steven Price <steven.price@arm.com> Reported-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Mike Rapoport <rppt@linux.ibm.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'init')
-rw-r--r--init/initramfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index cd5fb00fcb54..dab8d63459f6 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -524,7 +524,7 @@ static void __init free_initrd(void)
unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
unsigned long crashk_end = (unsigned long)__va(crashk_res.end);
#endif
- if (do_retain_initrd)
+ if (do_retain_initrd || !initrd_start)
goto skip;
#ifdef CONFIG_KEXEC_CORE