Commit 31925c88 authored Jul 30, 2006 by Peter Korsgaard Committed by Linus Torvalds Jul 31, 2006

[PATCH] Fix ppc32 zImage inflate



The recent zlib update (commit 4f3865fb)
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@rpsys.net: add comment]
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 163ecdff

lib/zlib_inflate/inflate.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -347,7 +347,10 @@ int zlib_inflate(z_streamp strm, int flush)
		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;