Fix ppc32 zImage inflate

[Richard Purdie]

ppc32's zImage inflates to address 0 which the recent zlib update took
as an error condition. Remove the check and note the problem so anyone
updating zlib in future won't fall into the same trap.

Reported-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Reported-by: Claus Gindhart <claus.gindhart@xxxxxxxxxxx>
Signed-off-by: Richard Purdie <rpurdie@xxxxxxxxx>

Index: git/lib/zlib_inflate/inflate.c
===================================================================
--- git.orig/lib/zlib_inflate/inflate.c	2006-07-15 09:11:07.000000000 +0100
+++ git/lib/zlib_inflate/inflate.c	2006-07-20 17:58:58.000000000 +0100
@@ -347,7 +347,10 @@
     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 ||
+    /* Do not check for strm->next_out == NULL here as ppc zImage
+       inflates to strm->next_out = 0 */
+
+    if (strm == NULL || strm->state == NULL ||
         (strm->next_in == NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/