linux.git/init/initramfs.c, branch v5.2-rc2

initramfs: don't free a non-existent initrd

2019-05-18T22:52:26+00:00

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 
Reported-by: Mark Rutland 
Tested-by: Mark Rutland 
Reviewed-by: Mike Rapoport 
Cc: Christoph Hellwig 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: poison freed initrd memory

2019-05-14T16:47:47+00:00

Various architectures including x86 poison the freed initrd memory.  Do
the same in the generic free_initrd_mem implementation and switch a few
more architectures that are identical to the generic code over to it now.

Link: http://lkml.kernel.org/r/20190213174621.29297-9-hch@lst.de
Signed-off-by: Christoph Hellwig 
Acked-by: Mike Rapoport 
Cc: Catalin Marinas 	[arm64]
Cc: Geert Uytterhoeven 	[m68k]
Cc: Steven Price 
Cc: Alexander Viro 
Cc: Guan Xuetao 
Cc: Russell King 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: provide a generic free_initrd_mem implementation

2019-05-14T16:47:47+00:00

For most architectures free_initrd_mem just expands to the same
free_reserved_area call.  Provide that as a generic implementation marked
__weak.

Link: http://lkml.kernel.org/r/20190213174621.29297-8-hch@lst.de
Signed-off-by: Christoph Hellwig 
Acked-by: Geert Uytterhoeven 	[m68k]
Acked-by: Mike Rapoport 
Cc: Catalin Marinas 	[arm64]
Cc: Steven Price 
Cc: Alexander Viro 
Cc: Guan Xuetao 
Cc: Russell King 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: move the legacy keepinitrd parameter to core code

2019-05-14T16:47:47+00:00

No need to handle the freeing disable in arch code when we already have a
core hook (and a different name for the option) for it.

Link: http://lkml.kernel.org/r/20190213174621.29297-7-hch@lst.de
Signed-off-by: Christoph Hellwig 
Acked-by: Catalin Marinas 	[arm64]
Acked-by: Mike Rapoport 
Cc: Geert Uytterhoeven 	[m68k]
Cc: Steven Price 
Cc: Alexander Viro 
Cc: Guan Xuetao 
Cc: Russell King 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: cleanup populate_rootfs

2019-05-14T16:47:47+00:00

The code for kernels that support ramdisks or not is mostly the same.
Unify it by using an IS_ENABLED for the info message, and moving the error
message into a stub for populate_initrd_image.

[cai@lca.pw: fix a compilation error]
  Link: http://lkml.kernel.org/r/20190328014806.36375-1-cai@lca.pw
Link: http://lkml.kernel.org/r/20190213174621.29297-6-hch@lst.de
Signed-off-by: Christoph Hellwig 
Signed-off-by: Qian Cai 
Acked-by: Mike Rapoport 
Cc: Catalin Marinas 	[arm64]
Cc: Geert Uytterhoeven 	[m68k]
Cc: Steven Price 
Cc: Alexander Viro 
Cc: Guan Xuetao 
Cc: Russell King 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: factor out a helper to populate the initrd image

2019-05-14T16:47:47+00:00

This will allow for cleaner code sharing in the caller.

Link: http://lkml.kernel.org/r/20190213174621.29297-5-hch@lst.de
Signed-off-by: Christoph Hellwig 
Acked-by: Mike Rapoport 
Cc: Catalin Marinas 	[arm64]
Cc: Geert Uytterhoeven 	[m68k]
Cc: Steven Price 
Cc: Alexander Viro 
Cc: Guan Xuetao 
Cc: Russell King 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: cleanup initrd freeing

2019-05-14T16:47:47+00:00

Factor the kexec logic into a separate helper, and then inline the rest of
free_initrd into the only caller.

Link: http://lkml.kernel.org/r/20190213174621.29297-4-hch@lst.de
Signed-off-by: Christoph Hellwig 
Acked-by: Mike Rapoport 
Cc: Catalin Marinas 	[arm64]
Cc: Geert Uytterhoeven 	[m68k]
Cc: Steven Price 
Cc: Alexander Viro 
Cc: Guan Xuetao 
Cc: Russell King 
Cc: Will Deacon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

initramfs: free initrd memory if opening /initrd.image fails

2019-05-14T16:47:47+00:00

Patch series "initramfs tidyups".

I've spent some time chasing down behavior in initramfs and found
plenty of opportunity to improve the code.  A first stab on that is
contained in this series.

This patch (of 7):

We free the initrd memory for all successful or error cases except for the
case where opening /initrd.image fails, which looks like an oversight.

Steven said:

: This also changes the behaviour when CONFIG_INITRAMFS_FORCE is enabled
: - specifically it means that the initrd is freed (previously it was
: ignored and never freed).  But that seems like reasonable behaviour and
: the previous behaviour looks like another oversight.

Link: http://lkml.kernel.org/r/20190213174621.29297-3-hch@lst.de
Signed-off-by: Christoph Hellwig 
Reviewed-by: Steven Price 
Acked-by: Mike Rapoport 
Cc: Catalin Marinas 	[arm64]
Cc: Geert Uytterhoeven 	[m68k]
Cc: Alexander Viro 
Cc: Russell King 
Cc: Will Deacon 
Cc: Guan Xuetao 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

init/initramfs.c: provide more details in error messages

2019-03-08T02:32:02+00:00

Use distinct error messages when archive decompression failed.

Link: http://lkml.kernel.org/r/20190212075635.7373-1-david.engraf@sysgo.com
Signed-off-by: David Engraf 
Reviewed-by: Andrew Morton 
Tested-by: Andy Shevchenko 
Cc: Dominik Brodowski 
Cc: Greg Kroah-Hartman 
Cc: Philippe Ombredanne 
Cc: Arnd Bergmann 
Cc: Luc Van Oostenryck 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

revert "initramfs: cleanup incomplete rootfs"

2019-02-21T17:00:59+00:00

Revert ff1522bb7d9845 ("initramfs: cleanup incomplete rootfs").

Andy reports

: This breaks my setup where I have U-boot provided more size of initramfs
: than needed.  This allows a bit of flexibility to increase or decrease
: initramfs compressed image without taking care of bootloader.  The proper
: solution is to do this if we sure that we didn't get enough memory,
: otherwise I can't consider the error fatal to clean up rootfs.

Fixes: ff1522bb7d9845 ("initramfs: cleanup incomplete rootfs")
Reported-by: Andy Shevchenko 
Tested-by: Andy Shevchenko 
Cc: David Engraf 
Cc: Dominik Brodowski 
Cc: Greg Kroah-Hartman 
Cc: Philippe Ombredanne 
Cc: Arnd Bergmann 
Cc: Luc Van Oostenryck 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds