| Message ID | 20120807020254.BE00F77A0F@aristotle.killerwolves.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/init/initramfs.c b/init/initramfs.c index 84c6bf1..26c2cb1 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -467,6 +467,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) compress_name); message = msg_buf; } + } else if (state == Reset) { + my_inptr = len; + pr_warn("%s: junk at end of compressed archive\n", __func__); } else error("junk in compressed archive"); if (state != Reset)
The initramfs handling since commit df37bd15 (initramfs: handle unrecognised decompressor when unpacking) has been rejecting valid images that have garbage after them. For example, on an architecture where the initramfs address and size are specified as a kernel parameter (specifically unicore32 and arm), specifying e.g. initrd=0x01000000,4M will not work unless the image is padded with nulls to 4MiB. This is unlikely to occur if the user is using this parameter to work around a bug in the bootloader. Signed-off-by: Ben Peddell <klightspeed@killerwolves.net> --- init/initramfs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)