Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Jun 2012 13:51:02 +0000 (UTC)
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r237162 - head/sys/netgraph/netflow
Message-ID:  <201206161351.q5GDp2c9047547@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206161351.q5GDp2c9047547>