Author: ae
Date: Thu Mar 28 10:08:58 2013
New Revision: 248823
URL: http://svnweb.freebsd.org/changeset/base/248823

Log:
  MFstable/8 r248822:
    Take the inpcb rlock before calculating checksum, it was accidentally
    moved in r191672.
  
  Approved by:  re (glebius)

Modified:
  releng/8.4/sys/netinet6/raw_ip6.c
Directory Properties:
  releng/8.4/sys/   (props changed)
  releng/8.4/sys/netinet6/   (props changed)

Modified: releng/8.4/sys/netinet6/raw_ip6.c
==============================================================================
--- releng/8.4/sys/netinet6/raw_ip6.c   Thu Mar 28 09:51:37 2013        
(r248822)
+++ releng/8.4/sys/netinet6/raw_ip6.c   Thu Mar 28 10:08:58 2013        
(r248823)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to