svn commit: r237162 - head/sys/netgraph/netflow

[Alexander V. Chernikov]

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 at 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