Patch "cls_u32: complete the check for non-forced case in u32_destroy()" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

cls_u32: complete the check for non-forced case in u32_destroy()

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
cls_u32-complete-the-check-for-non-forced-case-in-u32_destroy.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: WANG Cong <[email protected]>
Date: Tue, 25 Aug 2015 16:38:12 -0700
Subject: cls_u32: complete the check for non-forced case in u32_destroy()

From: WANG Cong <[email protected]>

[ Upstream commit a6c1aea044e490da3e59124ec55991fe316818d5 ]

In commit 1e052be69d04 ("net_sched: destroy proto tp when all filters are gone") I added a check in u32_destroy() to see if all real filters are gone for each tp, however, that is only done for root_ht, same is needed for others.

This can be reproduced by the following tc commands:

tc filter add dev eth0 parent 1:0 prio 5 handle 15: protocol ip u32 divisor 256 tc filter add dev eth0 protocol ip parent 1: prio 5 handle 15:2:2 u32 ht 15:2: match ip src 10.0.0.2 flowid 1:10
tc filter add dev eth0 protocol ip parent 1: prio 5 handle 15:2:3 u32 ht 15:2: match ip src 10.0.0.3 flowid 1:10

---
 net/sched/cls_u32.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

@@ -490,6 +490,19 @@ static bool u32_destroy(struct tcf_proto
 					return false;
 			}
 		}
+
+		if (tp_c->refcnt > 1)
+			return false;
+
+		if (tp_c->refcnt == 1) {
+			struct tc_u_hnode *ht;
+
+			for (ht = rtnl_dereference(tp_c->hlist);
+			     ht;
+			     ht = rtnl_dereference(ht->next))
+				if (!ht_empty(ht))
+					return false;
+		}
 	}
 
 	if (root_ht && --root_ht->refcnt == 0)

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/net-revert-net_sched-move-tp-root-allocation-into-fw_init.patch queue-4.1/cls_u32-complete-the-check-for-non-forced-case-in-u32_destroy.patch