Commit 54291362 authored by Phillip Lougher's avatar Phillip Lougher Committed by H. Peter Anvin

initramfs: add missing decompressor error check

The decompressors return error by calling a supplied error function, and/or
by returning an error return value.  The initramfs code, however, fails to
check the exit code returned by the decompressor, and only checks the error
status set by calling the error function.

This patch adds a return code check and calls the error function.
Signed-off-by: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
LKML-Reference: <4b26b1ef.0+ZWxT6886olqcSc%phillip@lougher.demon.co.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent d4529862
...@@ -413,7 +413,7 @@ static unsigned my_inptr; /* index of next byte to be processed in inbuf */ ...@@ -413,7 +413,7 @@ static unsigned my_inptr; /* index of next byte to be processed in inbuf */
static char * __init unpack_to_rootfs(char *buf, unsigned len) static char * __init unpack_to_rootfs(char *buf, unsigned len)
{ {
int written; int written, res;
decompress_fn decompress; decompress_fn decompress;
const char *compress_name; const char *compress_name;
static __initdata char msg_buf[64]; static __initdata char msg_buf[64];
...@@ -445,10 +445,12 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) ...@@ -445,10 +445,12 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
} }
this_header = 0; this_header = 0;
decompress = decompress_method(buf, len, &compress_name); decompress = decompress_method(buf, len, &compress_name);
if (decompress) if (decompress) {
decompress(buf, len, NULL, flush_buffer, NULL, res = decompress(buf, len, NULL, flush_buffer, NULL,
&my_inptr, error); &my_inptr, error);
else if (compress_name) { if (res)
error("decompressor failed");
} else if (compress_name) {
if (!message) { if (!message) {
snprintf(msg_buf, sizeof msg_buf, snprintf(msg_buf, sizeof msg_buf,
"compression method %s not configured", "compression method %s not configured",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment