aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Engraf <[email protected]>2019-03-07 16:30:19 -0800
committerLinus Torvalds <[email protected]>2019-03-07 18:32:02 -0800
commite5eed351fd5eb73eecc1407cf00309e868379253 (patch)
tree7fedfd73a1ad832fe8f9fd777a02f5e752fa7484
parent1a6a1dbeb72fce7517665b365085ea405490c2d5 (diff)
init/initramfs.c: provide more details in error messages
Use distinct error messages when archive decompression failed. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: David Engraf <[email protected]> Reviewed-by: Andrew Morton <[email protected]> Tested-by: Andy Shevchenko <[email protected]> Cc: Dominik Brodowski <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Philippe Ombredanne <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Luc Van Oostenryck <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--init/initramfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index fca899622937..4749e1115eef 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -431,7 +431,7 @@ static long __init flush_buffer(void *bufv, unsigned long len)
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(char *buf, unsigned long len)
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;