kern/156283: commit references a PR

[dfilter service]

The following reply was made to PR kern/156283; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/156283: commit references a PR
Date: Mon, 11 Nov 2013 12:49:07 +0000 (UTC)

 Author: ae
 Date: Mon Nov 11 12:49:00 2013
 New Revision: 257985
 URL: http://svnweb.freebsd.org/changeset/base/257985
 
 Log:
   Fix panic with RADIX_MPATH, when RTFREE_LOCKED() called for already
   unlocked route. Use in6_rtalloc() instead of in6_rtalloc1. This helps
   simplify the code and remove several now unused variables.
   
   PR:		156283
   MFC after:	2 weeks
 
 Modified:
   head/sys/netinet6/nd6_nbr.c
 
 Modified: head/sys/netinet6/nd6_nbr.c
 ==============================================================================
 --- head/sys/netinet6/nd6_nbr.c	Mon Nov 11 12:44:54 2013	(r257984)
 +++ head/sys/netinet6/nd6_nbr.c	Mon Nov 11 12:49:00 2013	(r257985)
 @@ -232,41 +232,28 @@ nd6_ns_input(struct mbuf *m, int off, in
  
  	/* (2) check. */
  	if (ifa == NULL) {
 -		struct rtentry *rt;
 -		struct sockaddr_in6 tsin6;
 -		int need_proxy;
 -#ifdef RADIX_MPATH
  		struct route_in6 ro;
 -#endif
 +		int need_proxy;
  
 -		bzero(&tsin6, sizeof tsin6);
 -		tsin6.sin6_len = sizeof(struct sockaddr_in6);
 -		tsin6.sin6_family = AF_INET6;
 -		tsin6.sin6_addr = taddr6;
 +		bzero(&ro, sizeof(ro));
 +		ro.ro_dst.sin6_len = sizeof(struct sockaddr_in6);
 +		ro.ro_dst.sin6_family = AF_INET6;
 +		ro.ro_dst.sin6_addr = taddr6;
  
  		/* Always use the default FIB. */
  #ifdef RADIX_MPATH
 -		bzero(&ro, sizeof(ro));
 -		ro.ro_dst = tsin6;
  		rtalloc_mpath_fib((struct route *)&ro, RTF_ANNOUNCE,
  		    RT_DEFAULT_FIB);
 -		rt = ro.ro_rt;
  #else
 -		rt = in6_rtalloc1((struct sockaddr *)&tsin6, 0, 0,
 -		    RT_DEFAULT_FIB);
 +		in6_rtalloc(&ro, RT_DEFAULT_FIB);
  #endif
 -		need_proxy = (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 &&
 -		    rt->rt_gateway->sa_family == AF_LINK);
 -		if (rt != NULL) {
 -			/*
 -			 * Make a copy while we can be sure that rt_gateway
 -			 * is still stable before unlocking to avoid lock
 -			 * order problems.  proxydl will only be used if
 -			 * proxy will be set in the next block.
 -			 */
 +		need_proxy = (ro.ro_rt &&
 +		    (ro.ro_rt->rt_flags & RTF_ANNOUNCE) != 0 &&
 +		    ro.ro_rt->rt_gateway->sa_family == AF_LINK);
 +		if (ro.ro_rt != NULL) {
  			if (need_proxy)
 -				proxydl = *SDL(rt->rt_gateway);
 -			RTFREE_LOCKED(rt);
 +				proxydl = *SDL(ro.ro_rt->rt_gateway);
 +			RTFREE(ro.ro_rt);
  		}
  		if (need_proxy) {
  			/*
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"