From owner-freebsd-bugs@FreeBSD.ORG  Fri Jan 13 18:00:20 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C37D416A420
	for <freebsd-bugs@hub.freebsd.org>;
	Fri, 13 Jan 2006 18:00:20 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6848243D5C
	for <freebsd-bugs@hub.freebsd.org>;
	Fri, 13 Jan 2006 18:00:11 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0DI0BiE099349
	for <freebsd-bugs@freefall.freebsd.org>; Fri, 13 Jan 2006 18:00:11 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0DI0BSp099348;
	Fri, 13 Jan 2006 18:00:11 GMT (envelope-from gnats)
Date: Fri, 13 Jan 2006 18:00:11 GMT
Message-Id: <200601131800.k0DI0BSp099348@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Robert Watson <rwatson@FreeBSD.org>
Cc: 
Subject: Re: kern/86427: LOR / Deadlock with FASTIPSEC and nat
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Robert Watson <rwatson@FreeBSD.org>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jan 2006 18:00:21 -0000

The following reply was made to PR kern/86427; it has been noted by GNATS.

From: Robert Watson <rwatson@FreeBSD.org>
To: Robert Huff <roberthuff@rcn.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: kern/86427: LOR / Deadlock with FASTIPSEC and nat
Date: Fri, 13 Jan 2006 17:52:39 +0000 (GMT)

 On Fri, 13 Jan 2006, Robert Huff wrote:
 
 > The following reply was made to PR kern/86427; it has been noted by GNATS.
 >
 > From: Robert Huff <roberthuff@rcn.com>
 > To: bug-followup@FreeBSD.org,  mike@sentex.net
 > Cc:
 > Subject: Re: kern/86427: LOR / Deadlock with FASTIPSEC and nat
 > Date: Thu, 12 Jan 2006 20:23:11 -0500
 >
 > 	I'm getting what seems to be either the same problem or its fraternal
 > twin ... only without either IPSEC (any flavor) or any vpn.
 > 	Running
 
 This may in part be due to a bug in IP divert sockets, resulting in recursion 
 in the network stack.  The attached untested patch may help, or at least, 
 eliminate part of the problem.  This hasn't yet been committed because I've 
 had trouble finding someone to test it.
 
 Index: ip_divert.c
 ===================================================================
 RCS file: /home/ncvs/src/sys/netinet/ip_divert.c,v
 retrieving revision 1.113
 diff -u -r1.113 ip_divert.c
 --- ip_divert.c	13 May 2005 11:44:37 -0000	1.113
 +++ ip_divert.c	13 Nov 2005 19:27:32 -0000
 @@ -61,6 +61,7 @@
   #include <vm/uma.h>
 
   #include <net/if.h>
 +#include <net/netisr.h>
   #include <net/route.h>
 
   #include <netinet/in.h>
 @@ -378,7 +379,7 @@
   		SOCK_UNLOCK(so);
   #endif
   		/* Send packet to input processing */
 -		ip_input(m);
 +		netisr_queue(NETISR_IP, m);
   	}
 
   	return error;