Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262259AbTFFUXS (ORCPT ); Fri, 6 Jun 2003 16:23:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262271AbTFFUXS (ORCPT ); Fri, 6 Jun 2003 16:23:18 -0400 Received: from mion.elka.pw.edu.pl ([194.29.160.35]:27046 "EHLO mion.elka.pw.edu.pl") by vger.kernel.org with ESMTP id S262259AbTFFUXQ (ORCPT ); Fri, 6 Jun 2003 16:23:16 -0400 Date: Fri, 6 Jun 2003 22:36:07 +0200 (MET DST) From: Bartlomiej Zolnierkiewicz To: =?iso-8859-1?Q?J=F6rn?= Engel cc: Linus Torvalds , Steven Cole , , Paul Mackerras Subject: Re: [Patch] 2.5.70-bk11 zlib merge #4 pure magic In-Reply-To: <20030606201306.GJ10487@wohnheim.fh-wedel.de> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=iso-8859-2 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2137 Lines: 60 On Fri, 6 Jun 2003, [iso-8859-1] J?rn Engel wrote: > Hi Linus! > > This one is pure magic, really. No comment and inspection of the code > doesn't show much either. But judging from the other changes, this > should also fix a real problem, at least a theoretical one. Eee, no magic here :-). from 1.1.4 ChangeLog: "- force windowBits > 8 to avoid a bug in the encoder for a window size of 256 bytes. (A complete fix will be available in 1.1.5)." I guess complete fix is here: http://www.cs.toronto.edu/~cosmin/pngtech/zlib-256win-bug.html Regards, -- Bartlomiej > The only code that could be bitten by this change is ppp, so I changed > that as well. Paulus, could you have a quick look at it? > > J?rn > > -- > This above all: to thine own self be true. > -- Shakespeare > > --- linux-2.5.70-bk11/lib/zlib_deflate/deflate.c~zlib_merge_magic 2003-06-06 20:44:51.000000000 +0200 > +++ linux-2.5.70-bk11/lib/zlib_deflate/deflate.c 2003-06-06 22:05:30.000000000 +0200 > @@ -216,7 +216,7 @@ > windowBits = -windowBits; > } > if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || > - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || > + windowBits < 9 || windowBits > 15 || level < 0 || level > 9 || > strategy < 0 || strategy > Z_HUFFMAN_ONLY) { > return Z_STREAM_ERROR; > } > --- linux-2.5.70-bk11/include/linux/ppp-comp.h~zlib_merge_magic 2003-06-05 17:46:35.000000000 +0200 > +++ linux-2.5.70-bk11/include/linux/ppp-comp.h 2003-06-06 22:07:08.000000000 +0200 > @@ -182,7 +182,7 @@ > #define CI_DEFLATE_DRAFT 24 /* value used in original draft RFC */ > #define CILEN_DEFLATE 4 /* length of its config option */ > > -#define DEFLATE_MIN_SIZE 8 > +#define DEFLATE_MIN_SIZE 9 > #define DEFLATE_MAX_SIZE 15 > #define DEFLATE_METHOD_VAL 8 > #define DEFLATE_SIZE(x) (((x) >> 4) + DEFLATE_MIN_SIZE) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/