Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 May 2002 22:12:28 +0900
From:      Hajimu UMEMOTO <ume@mahoroba.org>
To:        quak@mydiax.ch
Cc:        freebsd-security@FreeBSD.org
Subject:   Re: IPSEC: is ipcomp broken in 4.5-stable ?
Message-ID:  <yge3cwxa4sj.wl@mille.mahoroba.org>
In-Reply-To: <200205121250.g4CComR07757@dubb04h05-0.dplanet.ch>
References:  <200205121250.g4CComR07757@dubb04h05-0.dplanet.ch>

next in thread | previous in thread | raw e-mail | index | archive | help
Hi,

>>>>> On Sun, 12 May 2002 14:50:48 +0200
>>>>> quak@mydiax.ch said:

quak> Nop, patch says:

quak> Hunk #1 failed at 252.

quak> My kernel sources are from the original 4.5 CD (Image).

Okay, this patch is against ipcomp_core.c of 4.5-RELEASE.

Index: ipcomp_core.c
diff -u ipcomp_core.c.orig ipcomp_core.c
--- ipcomp_core.c.orig	Sun May 12 22:06:25 2002
+++ ipcomp_core.c	Sun May 12 22:09:42 2002
@@ -252,14 +252,17 @@
 			MOREBLOCK();
 		}
 
-		zerror = mode ? inflate(&zs, Z_FINISH)
+		zerror = mode ? inflate(&zs, Z_SYNC_FLUSH)
 			      : deflate(&zs, Z_FINISH);
 
 		if (zerror == Z_STREAM_END)
 			break;
-		else if (zerror == Z_OK)
-			; /*once more.*/
-		else {
+		else if (zerror == Z_OK) {
+			if (mode && zs.avail_out != 0)
+				goto terminate;
+			else
+				; /* once more. */
+		} else {
 			if (zs.msg) {
 				ipseclog((LOG_ERR, "ipcomp_%scompress: "
 				    "%sflate(Z_FINISH): %s\n",

--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@mahoroba.org  ume@bisd.hitachi.co.jp  ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-security" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?yge3cwxa4sj.wl>