Skip to contentSkip to conversation

Fix ppc32 zImage inflate

PATCH In review Peter Korsgaard 2 participants 3 messages Jul 20, 2006 – Jul 22, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix ppc32 zImage inflate

Hi,

The recent zlib update (commit 4f3865fb57a04db7cca068fed1c15badc064a302) broke ppc32 zImage decompression as it tries to decompress to address zero and the updated zlib_inflate checks that strm->next_out isn't a null pointer.

This little patch fixes it.

lib/zlib_inflate/inflate.c +1 -1
diff -Naur linux-2.6.18-rc2.orig/lib/zlib_inflate/inflate.c linux-2.6.18-rc2/lib/zlib_inflate/inflate.c
@@ -347,7 +347,7 @@
     static const unsigned short order[19] = /* permutation of code lengths */
         {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
-    if (strm == NULL || strm->state == NULL || strm->next_out == NULL ||
+    if (strm == NULL || strm->state == NULL ||
         (strm->next_in == NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
Signature · 1 line
Bye, Peter Korsgaard
#1 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Peter> Hi,
Peter> The recent zlib update (commit
Peter> 4f3865fb57a04db7cca068fed1c15badc064a302) broke ppc32 zImage Peter> decompression as it tries to decompress to address zero and the Peter> updated zlib_inflate checks that strm->next_out isn't a null pointer.

Peter> This little patch fixes it.

Crap - forgot to sign off :/

lib/zlib_inflate/inflate.c +1 -1
diff -Naur linux-2.6.18-rc2.orig/lib/zlib_inflate/inflate.c linux-2.6.18-rc2/lib/zlib_inflate/inflate.c
@@ -347,7 +347,7 @@
     static const unsigned short order[19] = /* permutation of code lengths */
         {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
-    if (strm == NULL || strm->state == NULL || strm->next_out == NULL ||
+    if (strm == NULL || strm->state == NULL ||
         (strm->next_in == NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
Signature · 1 line
Bye, Peter Korsgaard
Acked-by
#2 lore raw
Quoted 8 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Peter> Hi,
Peter> The recent zlib update (commit
Peter> 4f3865fb57a04db7cca068fed1c15badc064a302) broke ppc32 zImage Peter> decompression as it tries to decompress to address zero and the Peter> updated zlib_inflate checks that strm->next_out isn't a null pointer.

Quoted 4 lines

Peter> This little patch fixes it.

Crap - forgot to sign off :/

Quoted 21 lines

diff -Naur linux-2.6.18-rc2.orig/lib/zlib_inflate/inflate.c linux-2.6.18-rc2/lib/zlib_inflate/inflate.c

lib/zlib_inflate/inflate.c +1 -1
@@ -347,7 +347,7 @@
     static const unsigned short order[19] = /* permutation of code lengths */
         {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
-    if (strm == NULL || strm->state == NULL || strm->next_out == NULL ||
+    if (strm == NULL || strm->state == NULL ||
         (strm->next_in == NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
Signature · 6 lines
Bye, Peter Korsgaard
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Signature · 1 line
Tom Rini