From owner-svn-src-all@FreeBSD.ORG  Fri Apr  2 18:15:24 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16661106566C;
	Fri,  2 Apr 2010 18:15:24 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 00D018FC08;
	Fri,  2 Apr 2010 18:15:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o32IFNZ2035019;
	Fri, 2 Apr 2010 18:15:23 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o32IFNkN035017;
	Fri, 2 Apr 2010 18:15:23 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <201004021815.o32IFNkN035017@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Fri, 2 Apr 2010 18:15:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206111 - head/sys/netipsec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Apr 2010 18:15:24 -0000

Author: eri
Date: Fri Apr  2 18:15:23 2010
New Revision: 206111
URL: http://svn.freebsd.org/changeset/base/206111

Log:
  Fix a logic error in ipsec code that extracts
  information from the packets.
  
  Reviewed by:	bz, mlaier
  Approved by:	mlaier(mentor)
  MFC after:	1 month

Modified:
  head/sys/netipsec/ipsec.c

Modified: head/sys/netipsec/ipsec.c
==============================================================================
--- head/sys/netipsec/ipsec.c	Fri Apr  2 17:52:50 2010	(r206110)
+++ head/sys/netipsec/ipsec.c	Fri Apr  2 18:15:23 2010	(r206111)
@@ -592,7 +592,7 @@ ipsec4_get_ulp(struct mbuf *m, struct se
 	IPSEC_ASSERT(m->m_pkthdr.len >= sizeof(struct ip),("packet too short"));
 
 	/* NB: ip_input() flips it into host endian. XXX Need more checking. */
-	if (m->m_len < sizeof (struct ip)) {
+	if (m->m_len >= sizeof (struct ip)) {
 		struct ip *ip = mtod(m, struct ip *);
 		if (ip->ip_off & (IP_MF | IP_OFFMASK))
 			goto done;