Attachment 45714 Details for Bug 104085

[patch] zlib-kernel-fixes.diff

zlib-kernel-fixes.diff (text/plain), 2.46 KB, created by Marcus Meissner on 2005-08-11 11:38:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-08-11 11:38:36 UTC

Size: 2.46 KB

patch

obsolete

>From: Tim Yamin <plasmaroo@gentoo.org>
>Date: Mon, 25 Jul 2005 22:16:13 +0000 (+0100)
>Subject: [PATCH] Update in-kernel zlib routines
>X-Git-Tag: v2.6.13-rc6
>X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=4aad724d3e52238e1ce005f166fbba5b4072a7f6
>
>  [PATCH] Update in-kernel zlib routines
>  
>  These bugs have been fixed in the standard zlib for a while.
>  
>  See for example
>  
>   a) http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html
>   b) http://bugs.gentoo.org/show_bug.cgi?id=94584
>  
>  Signed-off-by: Tim Yamin <plasmaroo@gentoo.org>
>  Signed-off-by: Tavis Ormandy <taviso@gentoo.org>
>  Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>---
>
>--- 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 */
>--- a/lib/inflate.c
>+++ b/lib/inflate.c
>@@ -326,7 +326,7 @@ DEBG("huft1 ");
>   {
>     *t = (struct huft *)NULL;
>     *m = 0;
>-    return 0;
>+    return 2;
>   }
> 
> DEBG("huft2 ");
>@@ -374,6 +374,7 @@ DEBG("huft5 ");
>     if ((j = *p++) != 0)
>       v[x[j]++] = i;
>   } while (++i < n);
>+  n = x[g];                   /* set n to length of v */
> 
> DEBG("h6 ");
> 
>@@ -410,12 +411,13 @@ DEBG1("1 ");
> DEBG1("2 ");
>           f -= a + 1;           /* deduct codes from patterns left */
>           xp = c + k;
>-          while (++j < z)       /* try smaller tables up to z bits */
>-          {
>-            if ((f <<= 1) <= *++xp)
>-              break;            /* enough codes to use up j bits */
>-            f -= *xp;           /* else deduct codes from patterns */
>-          }
>+          if (j < z)
>+            while (++j < z)       /* try smaller tables up to z bits */
>+            {
>+              if ((f <<= 1) <= *++xp)
>+                break;            /* enough codes to use up j bits */
>+              f -= *xp;           /* else deduct codes from patterns */
>+            }
>         }
> DEBG1("3 ");
>         z = 1 << j;             /* table entries for j-bit table */
>--- a/lib/zlib_inflate/inftrees.c
>+++ b/lib/zlib_inflate/inftrees.c
>@@ -141,7 +141,7 @@ static int huft_build(
>   {
>     *t = NULL;
>     *m = 0;
>-    return Z_OK;
>+    return Z_DATA_ERROR;
>   }
> 
>

Actions: View | Diff

Attachments on bug 104085: 45714 | 45715 | 45717