[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20060722172734.GK24522@smtp.west.cox.net>
Date: Sat, 22 Jul 2006 10:27:34 -0700
From: Tom Rini <trini@...nel.crashing.org>
To: Peter Korsgaard <jacmet@...site.dk>, Andrew Morton <akpm@...l.org>
Cc: rpurdie@...ys.net, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Fix ppc32 zImage inflate
On Thu, Jul 20, 2006 at 06:01:23AM +0200, Peter Korsgaard wrote:
> >>>>> "Peter" == Peter Korsgaard <jacmet@...site.dk> 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 :/
>
Acked-by: Tom Rini <trini@...nel.crashing.org>
> Signed-off-by: Peter Korsgaard <jacmet@...site.dk>
>
> diff -Naur linux-2.6.18-rc2.orig/lib/zlib_inflate/inflate.c linux-2.6.18-rc2/lib/zlib_inflate/inflate.c
> --- linux-2.6.18-rc2.orig/lib/zlib_inflate/inflate.c 2006-07-20 10:26:21.000000000 +0200
> +++ linux-2.6.18-rc2/lib/zlib_inflate/inflate.c 2006-07-20 17:02:27.000000000 +0200
> @@ -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;
>
> --
> Bye, Peter Korsgaard
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Tom Rini
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists