svn commit: r248180 - head/sys/netinet6

Andrey V. Elsukov ae at FreeBSD.org
Tue Mar 12 02:20:21 UTC 2013


Author: ae
Date: Tue Mar 12 02:20:20 2013
New Revision: 248180
URL: http://svnweb.freebsd.org/changeset/base/248180

Log:
  Take the inpcb rlock before calculating checksum, it was accidentally
  moved in r191672.
  
  Obtained from:	Yandex LLC
  MFC after:	1 week

Modified:
  head/sys/netinet6/raw_ip6.c

Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c	Tue Mar 12 02:12:47 2013	(r248179)
+++ head/sys/netinet6/raw_ip6.c	Tue Mar 12 02:20:20 2013	(r248180)
@@ -197,6 +197,7 @@ rip6_input(struct mbuf **mp, int *offp, 
 			    &ip6->ip6_dst) != 0)
 				continue;
 		}
+		INP_RLOCK(in6p);
 		if (in6p->in6p_cksum != -1) {
 			V_rip6stat.rip6s_isum++;
 			if (in6_cksum(m, proto, *offp,
@@ -206,7 +207,6 @@ rip6_input(struct mbuf **mp, int *offp, 
 				continue;
 			}
 		}
-		INP_RLOCK(in6p);
 		/*
 		 * If this raw socket has multicast state, and we
 		 * have received a multicast, check if this socket


More information about the svn-src-all mailing list