[Patch] 2.5.70-bk11 zlib merge #4 pure magic

Jörn Engel (joern@wohnheim.fh-wedel.de)
Fri, 6 Jun 2003 22:13:07 +0200


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.

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/