Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Mar 2013 09:51:37 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r248822 - stable/8/sys/netinet6
Message-ID:  <201303280951.r2S9pb1i088422@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Thu Mar 28 09:51:37 2013
New Revision: 248822
URL: http://svnweb.freebsd.org/changeset/base/248822

Log:
  MFC r248180:
    Take the inpcb rlock before calculating checksum, it was accidentally
    moved in r191672.

Modified:
  stable/8/sys/netinet6/raw_ip6.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet6/   (props changed)

Modified: stable/8/sys/netinet6/raw_ip6.c
==============================================================================
--- stable/8/sys/netinet6/raw_ip6.c	Thu Mar 28 09:03:15 2013	(r248821)
+++ stable/8/sys/netinet6/raw_ip6.c	Thu Mar 28 09:51:37 2013	(r248822)
@@ -195,6 +195,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,
@@ -204,7 +205,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



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