The patch titled
Fix ppc32 zImage inflate
has been added to the -mm tree. Its filename is
fix-ppc32-zimage-inflate.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix ppc32 zImage inflate
From: Peter Korsgaard <jacmet@xxxxxxxxxx>
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.
[rpurdie@xxxxxxxxx: add comment]
Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Acked-by: Tom Rini <trini@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Richard Purdie <rpurdie@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
lib/zlib_inflate/inflate.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN lib/zlib_inflate/inflate.c~fix-ppc32-zimage-inflate lib/zlib_inflate/inflate.c
--- a/lib/zlib_inflate/inflate.c~fix-ppc32-zimage-inflate
+++ a/lib/zlib_inflate/inflate.c
@@ -347,7 +347,10 @@ int zlib_inflate(z_streamp strm, int flu
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;
_
Patches currently in -mm which might be from jacmet@xxxxxxxxxx are
fix-ppc32-zimage-inflate.patch
smc911x-re-release-spinlock-on-spurious-interrupt.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
