adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-26 18:56:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

initramfs: add missing decompressor error check

Browse source 
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: Phillip Lougher <phillip@lougher.demon.co.uk>
LKML-Reference: <4b26b1ef.0+ZWxT6886olqcSc%phillip@lougher.demon.co.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Phillip Lougher 2009-12-14 21:45:19 +00:00 committed by H. Peter Anvin
parent d4529862ca
commit 54291362d2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
init/initramfs.c
View file

@ -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)
} }
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",