From owner-freebsd-net@FreeBSD.ORG Tue Sep 28 14:29:59 2004 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A24D16A4CE; Tue, 28 Sep 2004 14:29:59 +0000 (GMT) Received: from outbound0.sv.meer.net (outbound0.sv.meer.net [205.217.152.13]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC7C143D39; Tue, 28 Sep 2004 14:29:58 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from mail.meer.net (mail.meer.net [209.157.152.14]) i8SETEr2040690; Tue, 28 Sep 2004 07:29:14 -0700 (PDT) (envelope-from gnn@neville-neil.com) Received: from minion.local.neville-neil.com (pc1.oakwoodazabu1-unet.ocn.ne.jp [220.110.140.201]) by mail.meer.net (8.12.10/8.12.2/meer) with ESMTP id i8SET2jt083514; Tue, 28 Sep 2004 07:29:06 -0700 (PDT) (envelope-from gnn@neville-neil.com) Date: Tue, 28 Sep 2004 23:28:50 +0900 Message-ID: From: "George V. Neville-Neil" To: freebsd-net@freebsd.org, rwatson@freebsd.org In-Reply-To: References: User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.5 Emacs/21.2 (powerpc-apple-darwin) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII Subject: Re: (KAME-snap 8809) Patch for fragment problem in key.c X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2004 14:29:59 -0000 So, I checked and the change in Kame is identical. Can we get this committed to our code? It's a simple, five line, removal. Thanks, George At Tue, 28 Sep 2004 10:39:09 +0900, George V. Neville-Neil wrote: > > Hi Folks, > > Robert Watson tried to send email about this but it never got > through, and then Sam Leffler got ahold of me and told me he > fixed something similar in the FAST_IPSEC code. So, the > following patch fixes, in KAME IPSec. This patch was > generated against 6.0-CURRENT and I included Sam's commit > message. > > Later, > George > > Correct handling of SADB_UPDATE and SADB_ADD requests. key_align may split > the mbuf due to use of m_pulldown. Discarding the result because of this > does not make sense as no subsequent code depends on the entire msg being > linearized (only the individual pieces). It's likely something else is wrong > here but for now this appears to get things back to a working state. > > Index: sys/netkey/key.c > =================================================================== > RCS file: /Volumes/exported/FreeBSD-CVS/src/sys/netkey/key.c,v > retrieving revision 1.67 > diff -u -r1.67 key.c > --- sys/netkey/key.c 2 Sep 2004 20:14:03 -0000 1.67 > +++ sys/netkey/key.c 27 Sep 2004 16:08:31 -0000 > @@ -6952,11 +6952,6 @@ > if (error) > return error; > > - if (m->m_next) { /*XXX*/ > - m_freem(m); > - return ENOBUFS; > - } > - > msg = mh.msg; > > /* check SA type */ >