Browse Source

net_sched: act: Delete estimator in error path.

Some action modules free struct tcf_common in their error path
while estimator is still active. This results in est_timer()
dereference freed memory.
Add gen_kill_estimator() in ipt, pedit and simple action.

Signed-off-by: Hiroaki SHIMODA <shimoda.hiroaki@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Hiroaki SHIMODA 13 năm trước cách đây
mục cha
commit
47fd92f5a7

+ 6 - 1
net/sched/act_ipt.c

@@ -185,7 +185,12 @@ err3:
 err2:
 err2:
 	kfree(tname);
 	kfree(tname);
 err1:
 err1:
-	kfree(pc);
+	if (ret == ACT_P_CREATED) {
+		if (est)
+			gen_kill_estimator(&pc->tcfc_bstats,
+					   &pc->tcfc_rate_est);
+		kfree_rcu(pc, tcfc_rcu);
+	}
 	return err;
 	return err;
 }
 }
 
 

+ 4 - 1
net/sched/act_pedit.c

@@ -74,7 +74,10 @@ static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,
 		p = to_pedit(pc);
 		p = to_pedit(pc);
 		keys = kmalloc(ksize, GFP_KERNEL);
 		keys = kmalloc(ksize, GFP_KERNEL);
 		if (keys == NULL) {
 		if (keys == NULL) {
-			kfree(pc);
+			if (est)
+				gen_kill_estimator(&pc->tcfc_bstats,
+						   &pc->tcfc_rate_est);
+			kfree_rcu(pc, tcfc_rcu);
 			return -ENOMEM;
 			return -ENOMEM;
 		}
 		}
 		ret = ACT_P_CREATED;
 		ret = ACT_P_CREATED;

+ 4 - 1
net/sched/act_simple.c

@@ -131,7 +131,10 @@ static int tcf_simp_init(struct nlattr *nla, struct nlattr *est,
 		d = to_defact(pc);
 		d = to_defact(pc);
 		ret = alloc_defdata(d, defdata);
 		ret = alloc_defdata(d, defdata);
 		if (ret < 0) {
 		if (ret < 0) {
-			kfree(pc);
+			if (est)
+				gen_kill_estimator(&pc->tcfc_bstats,
+						   &pc->tcfc_rate_est);
+			kfree_rcu(pc, tcfc_rcu);
 			return ret;
 			return ret;
 		}
 		}
 		d->tcf_action = parm->action;
 		d->tcf_action = parm->action;