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

bzip2/lzma: comprehensible error messages for missing decompressor

Browse source 
Instead of failing to identify a compressed image with a decompressor
that we don't have compiled in, identify it and fail with a
comprehensible panic message.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2009-01-12 14:24:04 -08:00
parent 736f93236c
commit 23a22d57a8
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
init/do_mounts_rd.c
View file

@ -79,9 +79,12 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
sys_read(fd, buf, size); sys_read(fd, buf, size);
*decompressor = decompress_method(buf, size, &compress_name); *decompressor = decompress_method(buf, size, &compress_name);
if (*decompressor) { if (compress_name) {
printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n", printk(KERN_NOTICE "RAMDISK: %s image found at block %d\n",
compress_name, start_block); compress_name, start_block);
if (!*decompressor)
printk(KERN_CRIT "RAMDISK: %s decompressor not configured!\n",
compress_name);
nblocks = 0; nblocks = 0;
goto done; goto done;
} }

12
init/initramfs.c
View file

@ -421,6 +421,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{ {
int written; int written;
decompress_fn decompress; decompress_fn decompress;
const char *compress_name;
static __initdata char msg_buf[64];
dry_run = check_only; dry_run = check_only;
header_buf = kmalloc(110, GFP_KERNEL); header_buf = kmalloc(110, GFP_KERNEL);
@ -449,10 +451,18 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
continue; continue;
} }
this_header = 0; this_header = 0;
decompress = decompress_method(buf, len, NULL); decompress = decompress_method(buf, len, &compress_name);
if (decompress) if (decompress)
decompress(buf, len, NULL, flush_buffer, NULL, decompress(buf, len, NULL, flush_buffer, NULL,
&my_inptr, error); &my_inptr, error);
else if (compress_name) {
if (!message) {
snprintf(msg_buf, sizeof msg_buf,
"compression method %s not configured",
compress_name);
message = msg_buf;
}
}
if (state != Reset) if (state != Reset)
error("junk in compressed archive"); error("junk in compressed archive");
this_header = saved_offset + my_inptr; this_header = saved_offset + my_inptr;

16
lib/decompress.c
View file

@ -13,21 +13,25 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/string.h> #include <linux/string.h>
#ifndef CONFIG_DECOMPRESS_GZIP
# define gunzip NULL
#endif
#ifndef CONFIG_DECOMPRESS_BZIP2
# define bunzip2 NULL
#endif
#ifndef CONFIG_DECOMPRESS_LZMA
# define unlzma NULL
#endif
static const struct compress_format { static const struct compress_format {
unsigned char magic[2]; unsigned char magic[2];
const char *name; const char *name;
decompress_fn decompressor; decompress_fn decompressor;
} compressed_formats[] = { } compressed_formats[] = {
#ifdef CONFIG_DECOMPRESS_GZIP
{ {037, 0213}, "gzip", gunzip }, { {037, 0213}, "gzip", gunzip },
{ {037, 0236}, "gzip", gunzip }, { {037, 0236}, "gzip", gunzip },
#endif
#ifdef CONFIG_DECOMPRESS_BZIP2
{ {0x42, 0x5a}, "bzip2", bunzip2 }, { {0x42, 0x5a}, "bzip2", bunzip2 },
#endif
#ifdef CONFIG_DECOMPRESS_LZMA
{ {0x5d, 0x00}, "lzma", unlzma }, { {0x5d, 0x00}, "lzma", unlzma },
#endif
{ {0, 0}, NULL, NULL } { {0, 0}, NULL, NULL }
}; };