diff options
| author | Tim Yamin <plasmaroo@gentoo.org> | 2005-07-25 23:16:13 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-08-14 17:20:09 -0700 |
| commit | 885605316d76c3fdce23dffe9c59e20539287c6b (patch) | |
| tree | bb5e6bfcbd99d565d6dd2274af2b6bd0dffeabd7 /arch/ppc64 | |
| parent | 8f5a9b18ec1b8af04a8d9e1fcce04cf8dbb08019 (diff) | |
[PATCH] Update in-kernel zlib routines (CAN-2005-2458, CAN-2005-2459)
Fix outstanding security bugs in the Linux zlib implementations. See:
a) http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html
CAN-2005-2458
b) http://bugs.gentoo.org/show_bug.cgi?id=94584
CAN-2005-2459
Signed-off-by: Tim Yamin <plasmaroo@gentoo.org>
Signed-off-by: Tavis Ormandy <taviso@gentoo.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/boot/zlib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c index 9d5e4e9832d..78837e884b8 100644 --- a/arch/ppc64/boot/zlib.c +++ b/arch/ppc64/boot/zlib.c @@ -1307,7 +1307,7 @@ local int huft_build( { *t = (inflate_huft *)Z_NULL; *m = 0; - return Z_OK; + return Z_DATA_ERROR; } @@ -1351,6 +1351,7 @@ local int huft_build( if ((j = *p++) != 0) v[x[j]++] = i; } while (++i < n); + n = x[g]; /* set n to length of v */ /* Generate the Huffman codes and for each, make the table entries */ |