From owner-svn-src-all@FreeBSD.ORG  Sat Jun 16 13:51:02 2012
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 56BB71065672;
	Sat, 16 Jun 2012 13:51:02 +0000 (UTC)
	(envelope-from melifaro@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 41BF88FC1E;
	Sat, 16 Jun 2012 13:51:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5GDp27n047549;
	Sat, 16 Jun 2012 13:51:02 GMT
	(envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5GDp2c9047547;
	Sat, 16 Jun 2012 13:51:02 GMT
	(envelope-from melifaro@svn.freebsd.org)
Message-Id: <201206161351.q5GDp2c9047547@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sat, 16 Jun 2012 13:51:02 +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: r237162 - head/sys/netgraph/netflow
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: Sat, 16 Jun 2012 13:51:02 -0000

Author: melifaro
Date: Sat Jun 16 13:51:01 2012
New Revision: 237162
URL: http://svn.freebsd.org/changeset/base/237162

Log:
  Fix improper L4 header handling for IPv6 packets passed via DLT_RAW.
  
  Reported by:     Emil Muratov <gpm@hotplug.ru>
  Reviewed by:     glebius
  Approved by:     ae(mentor)
  MFC after:       1 week

Modified:
  head/sys/netgraph/netflow/ng_netflow.c

Modified: head/sys/netgraph/netflow/ng_netflow.c
==============================================================================
--- head/sys/netgraph/netflow/ng_netflow.c	Sat Jun 16 13:22:55 2012	(r237161)
+++ head/sys/netgraph/netflow/ng_netflow.c	Sat Jun 16 13:51:01 2012	(r237162)
@@ -712,7 +712,7 @@ ng_netflow_rcvdata (hook_p hook, item_p 
 		if (ip->ip_v == IP6VERSION) {
 			/* IPv6 packet */
 			ip = NULL;
-			M_CHECK(sizeof(struct ip6_hdr));
+			M_CHECK(sizeof(struct ip6_hdr) - sizeof(struct ip));
 			ip6 = mtod(m, struct ip6_hdr *);
 		}
 #endif