Attachment 314120 Details for Bug 458846 – Upstream patch from CVS

[patch] Upstream patch from CVS

bug-458846.patch (text/plain), 1.93 KB, created by Josh Bressers on 2008-08-12 17:27:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2008-08-12 17:27:04 UTC

Size: 1.93 KB

patch

obsolete

>commit ce7557ae74a8c349b2c8871ab641fbcdf59d5181
>Author: vanhu <vanhu>
>Date:   Tue Aug 12 12:45:55 2008 +0000
>
>    Remove ph1handler if we received an invalid first exchange from initiator
>
>diff --git a/ChangeLog b/ChangeLog
>index 00fd592..9cbbf6a 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,8 @@
>+2008-08-12  Yvan Vanhullebus  <vanhu@netasq.com>
>+	From Krzysztof Oledzki <olel@ans.pl>:
>+	* src/racoon/isakmp.c: Remove ph1handler if we received an invalid
>+	  first exchange from initiator.
>+
> 2008-08-06  Timo Teras  <timo.teras@iki.fi>
> 	From Krzysztof Piotr Oledzki <olel@ans.pl>:
> 	* src/racoon/{privsep.c|session.c|session.h}: make privileged
>diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c
>index 5b81e5b..4d4e2f2 100644
>--- a/src/racoon/isakmp.c
>+++ b/src/racoon/isakmp.c
>@@ -1,4 +1,4 @@
>-/*	$NetBSD: isakmp.c,v 1.37 2008/07/14 05:40:13 tteras Exp $	*/
>+/*	$NetBSD: isakmp.c,v 1.38 2008/08/12 12:45:55 vanhu Exp $	*/
> 
> /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
> 
>@@ -801,20 +801,24 @@ ph1_main(iph1, msg)
> 			    [iph1->side]
> 			    [iph1->status])(iph1, msg);
> 	if (error != 0) {
>-#if 0
>+
> 		/* XXX
> 		 * When an invalid packet is received on phase1, it should
> 		 * be selected to process this packet.  That is to respond
> 		 * with a notify and delete phase 1 handler, OR not to respond
>-		 * and keep phase 1 handler.
>+		 * and keep phase 1 handler. However, in PHASE1ST_START when
>+		 * acting as RESPONDER we must not keep phase 1 handler or else
>+		 * it will stay forever.
> 		 */
>-		plog(LLV_ERROR, LOCATION, iph1->remote,
>-			"failed to pre-process packet.\n");
>-		return -1;
>-#else
>-		/* ignore the error and keep phase 1 handler */
>-		return 0;
>-#endif
>+
>+		if (iph1->side == RESPONDER && iph1->status == PHASE1ST_START) {
>+			plog(LLV_ERROR, LOCATION, iph1->remote,
>+				"failed to pre-process packet.\n");
>+			return -1;
>+		} else {
>+			/* ignore the error and keep phase 1 handler */
>+			return 0;
>+		}
> 	}
> 
> #ifndef ENABLE_FRAG

Actions: View | Diff

Attachments on bug 458846: 314120