Add call to zlib's 'uncompress' function. Add function to display the right error message depending on the decompression's return value.
Signed-off-by: Joao Marcos Costa joaomarcos.costa@bootlin.com --- Changes in v2: - Changed commit title and message, which were wrong and/or misleading in v1. fs/squashfs/sqfs_decompressor.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
diff --git a/fs/squashfs/sqfs_decompressor.c b/fs/squashfs/sqfs_decompressor.c index a899a5704b..a8c37f73b7 100644 --- a/fs/squashfs/sqfs_decompressor.c +++ b/fs/squashfs/sqfs_decompressor.c @@ -9,17 +9,41 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> +#include <u-boot/zlib.h>
#include "sqfs_decompressor.h" #include "sqfs_filesystem.h" #include "sqfs_utils.h"
+static void zlib_decompression_status(int ret) +{ + switch (ret) { + case Z_BUF_ERROR: + printf("Error: 'dest' buffer is not large enough.\n"); + break; + case Z_DATA_ERROR: + printf("Error: corrupted compressed data.\n"); + break; + case Z_MEM_ERROR: + printf("Error: insufficient memory.\n"); + break; + } +} + int sqfs_decompress(u16 comp_type, void *dest, unsigned long *dest_len, void *source, u32 lenp) { int ret = 0;
switch (comp_type) { + case SQFS_COMP_ZLIB: + ret = uncompress(dest, dest_len, source, lenp); + if (ret) { + zlib_decompression_status(ret); + return -EINVAL; + } + + break; default: printf("Error: unknown compression type.\n"); return -EINVAL;