svn commit: r232058 - stable/9/sys/net

[Kip Macy]

Author: kmacy
Date: Thu Feb 23 18:50:19 2012
New Revision: 232058
URL: http://svn.freebsd.org/changeset/base/232058

Log:
  MFC r230598
  
   A flowtable entry can continue referencing an llentry indefinitely if the entry is repeatedly
   referenced within its timeout window. This change clears the LLE_VALID flag when an llentry
   is removed from an interface's hash table and adds an extra check to the flowtable code
   for the LLE_VALID flag in llentry to avoid retaining and using a stale reference.

Modified:
  stable/9/sys/net/flowtable.c
  stable/9/sys/net/if_llatbl.c

Modified: stable/9/sys/net/flowtable.c
==============================================================================
--- stable/9/sys/net/flowtable.c	Thu Feb 23 18:49:38 2012	(r232057)
+++ stable/9/sys/net/flowtable.c	Thu Feb 23 18:50:19 2012	(r232058)
@@ -1185,12 +1185,14 @@ keycheck:	
 	rt = __DEVOLATILE(struct rtentry *, fle->f_rt);
 	lle = __DEVOLATILE(struct llentry *, fle->f_lle);
 	if ((rt != NULL)
+	    && lle != NULL
 	    && fle->f_fhash == hash
 	    && flowtable_key_equal(fle, key)
 	    && (proto == fle->f_proto)
 	    && (fibnum == fle->f_fibnum)
 	    && (rt->rt_flags & RTF_UP)
-	    && (rt->rt_ifp != NULL)) {
+	    && (rt->rt_ifp != NULL)
+	    && (lle->la_flags & LLE_VALID)) {
 		fs->ft_hits++;
 		fle->f_uptime = time_uptime;
 		fle->f_flags |= flags;

Modified: stable/9/sys/net/if_llatbl.c
==============================================================================
--- stable/9/sys/net/if_llatbl.c	Thu Feb 23 18:49:38 2012	(r232057)
+++ stable/9/sys/net/if_llatbl.c	Thu Feb 23 18:50:19 2012	(r232058)
@@ -125,6 +125,7 @@ llentry_free(struct llentry *lle)
 		("%s: la_numheld %d > 0, pkts_droped %zd", __func__, 
 		 lle->la_numheld, pkts_dropped));
 
+	lle->la_flags &= ~LLE_VALID;
 	LLE_FREE_LOCKED(lle);
 
 	return (pkts_dropped);