[PATCH] 2.4.21 zlib merge #4 windowBits

Jörn Engel (joern@wohnheim.fh-wedel.de)
Sat, 14 Jun 2003 15:50:26 +0200


Disallow windowBits <9 (windowBits=9 would hit a bug) for deflate and
do the same for ppp.

Jörn

-- 
Anything that can go wrong, will.
-- Finagle's Law

--- linux-2.4.20/lib/zlib_deflate/deflate.c~zlib_merge_magic 2003-06-10 12:37:17.000000000 +0200 +++ linux-2.4.20/lib/zlib_deflate/deflate.c 2003-06-10 17:01:02.000000000 +0200 @@ -215,7 +215,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.4.20/include/linux/ppp-comp.h~zlib_merge_magic 1999-08-06 19:44:11.000000000 +0200 +++ linux-2.4.20/include/linux/ppp-comp.h 2003-06-10 17:01:02.000000000 +0200 @@ -177,7 +177,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/