The patch titled
Subject: init/initramfs.c: provide more details in error messages
has been added to the -mm tree. Its filename is
initramfs-provide-more-details-in-error-messages.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/initramfs-provide-more-details-in-error-messages.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/initramfs-provide-more-details-in-error-messages.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: David Engraf <david.engraf@xxxxxxxxx>
Subject: init/initramfs.c: provide more details in error messages
Use distinct error messages when archive decompression failed.
Link: http://lkml.kernel.org/r/20190212075635.7373-1-david.engraf@xxxxxxxxx
Signed-off-by: David Engraf <david.engraf@xxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Philippe Ombredanne <pombredanne@xxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/initramfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/init/initramfs.c~initramfs-provide-more-details-in-error-messages
+++ a/init/initramfs.c
@@ -431,7 +431,7 @@ static long __init flush_buffer(void *bu
len -= written;
state = Reset;
} else
- error("junk in compressed archive");
+ error("junk within compressed archive");
}
return origLen;
}
@@ -488,9 +488,9 @@ static char * __init unpack_to_rootfs(ch
message = msg_buf;
}
} else
- error("junk in compressed archive");
+ error("invalid magic at start of compressed archive");
if (state != Reset)
- error("junk in compressed archive");
+ error("junk at the end of compressed archive");
this_header = saved_offset + my_inptr;
buf += my_inptr;
len -= my_inptr;
_
Patches currently in -mm which might be from david.engraf@xxxxxxxxx are
initramfs-provide-more-details-in-error-messages.patch
