Skip to contentSkip to conversation

Fix gunzip in case of insufficient output buffer

PATCH New Matthias Fuchs 2 participants 3 messages Jan 2, 2009 – Jan 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix gunzip in case of insufficient output buffer

U-Boot's gunzip() function does not handle the return code of zlib's inflate() function correctly. gunzip() is implemented to uncompress all input data in one run. So the correct return code for the good case is Z_STREAM_END. In case of insufficient output buffer memory inflate returns Z_OK. For gunzip() this is an error.

It also makes sense to me to call inflateEnd() also in case of an error.

---
 common/cmd_bootm.c   |    2 +-
 lib_generic/gunzip.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
common/cmd_bootm.c +1 -1
index a8f85e9..9055672 100644
@@ -350,7 +350,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 		printf ("   Uncompressing %s ... ", type_name);
 		if (gunzip ((void *)load, unc_len,
 					(uchar *)image_start, &image_len) != 0) {
-			puts ("GUNZIP: uncompress or overwrite error "
+			puts ("GUNZIP: uncompress, out-of-mem or overwrite error "
 				"- must RESET board to recover\n");
 			if (boot_progress)
 				show_boot_progress (-6);
lib_generic/gunzip.c +2 -1
index 74f0bf9..5bcf5b7 100644
@@ -102,8 +102,9 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
 	s.next_out = dst;
 	s.avail_out = dstlen;
 	r = inflate(&s, Z_FINISH);
-	if (r != Z_OK && r != Z_STREAM_END) {
+	if (r != Z_STREAM_END) {
 		printf ("Error: inflate() returned %d\n", r);
+		inflateEnd(&s);
 		return (-1);
 	}
 	*lenp = s.next_out - (unsigned char *) dst;
Signature · 1 line
1.5.6.3
#1 lore raw

PATCH 1/1 Fix gunzip in case of insufficient output buffer

Hi,

did anybody check my gunzip fix? I'm not a zlib expert, but I think we have a little issue here.

Matthias

Quoted 44 lines · Matthias Fuchs

U-Boot's gunzip() function does not handle the return code of zlib's inflate() function correctly. gunzip() is implemented to uncompress all input data in one run. So the correct return code for the good case is Z_STREAM_END. In case of insufficient output buffer memory inflate returns Z_OK. For gunzip() this is an error.

It also makes sense to me to call inflateEnd() also in case of an error.

---
 common/cmd_bootm.c   |    2 +-
 lib_generic/gunzip.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
common/cmd_bootm.c +1 -1
index a8f85e9..9055672 100644
@@ -350,7 +350,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 		printf ("   Uncompressing %s ... ", type_name);
 		if (gunzip ((void *)load, unc_len,
 					(uchar *)image_start, &image_len) != 0) {
-			puts ("GUNZIP: uncompress or overwrite error "
+			puts ("GUNZIP: uncompress, out-of-mem or overwrite error "
 				"- must RESET board to recover\n");
 			if (boot_progress)
 				show_boot_progress (-6);
lib_generic/gunzip.c +2 -1
index 74f0bf9..5bcf5b7 100644
@@ -102,8 +102,9 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
 	s.next_out = dst;
 	s.avail_out = dstlen;
 	r = inflate(&s, Z_FINISH);
-	if (r != Z_OK && r != Z_STREAM_END) {
+	if (r != Z_STREAM_END) {
 		printf ("Error: inflate() returned %d\n", r);
+		inflateEnd(&s);
 		return (-1);
 	}
 	*lenp = s.next_out - (unsigned char *) dst;
#2 lore raw

PATCH 1/1 Fix gunzip in case of insufficient output buffer

In reply to Matthias Fuchs

Dear Matthias Fuchs,

Quoted 7 lines · In message <[email protected]> you wrote:

U-Boot's gunzip() function does not handle the return code of zlib's inflate() function correctly. gunzip() is implemented to uncompress all input data in one run. So the correct return code for the good case is Z_STREAM_END. In case of insufficient output buffer memory inflate returns Z_OK. For gunzip() this is an error.

Quoted 8 lines

It also makes sense to me to call inflateEnd() also in case of an error.

---
 common/cmd_bootm.c   |    2 +-
 lib_generic/gunzip.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
HEALTH WARNING: Care Should Be Taken When Lifting This Product, Since
Its Mass, and Thus Its Weight, Is Dependent on Its Velocity  Relative
to the User.