Commit ba9a1908 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sched-action-idr-leak' 



Davide Caratti says:

====================
fix idr leak in actions

This series fixes situations where a temporary failure to install a TC
action results in the permanent impossibility to reuse the configured
value of 'index'.

Thanks to Cong Wang for the initial review.

v2: fix build error in act_ipt.c, reported by kbuild test robot
====================

Acked-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3f2176dd f29cdfbe

net/sched/act_bpf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -352,7 +352,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla, 
	return res;

	return res;

out:

out:

	if (res == ACT_P_CREATED)

	if (res == ACT_P_CREATED)

		tcf_idr_cleanup(*act, est);

		tcf_idr_release(*act, bind);





	return ret;

	return ret;

}

}

net/sched/act_ipt.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -80,10 +80,13 @@ static void ipt_destroy_target(struct xt_entry_target *t) 
static void tcf_ipt_release(struct tc_action *a)

static void tcf_ipt_release(struct tc_action *a)

{

{

	struct tcf_ipt *ipt = to_ipt(a);

	struct tcf_ipt *ipt = to_ipt(a);



	if (ipt->tcfi_t) {

		ipt_destroy_target(ipt->tcfi_t);

		ipt_destroy_target(ipt->tcfi_t);

	kfree(ipt->tcfi_tname);

		kfree(ipt->tcfi_t);

		kfree(ipt->tcfi_t);

	}

	}

	kfree(ipt->tcfi_tname);

}





static const struct nla_policy ipt_policy[TCA_IPT_MAX + 1] = {

static const struct nla_policy ipt_policy[TCA_IPT_MAX + 1] = {

	[TCA_IPT_TABLE]	= { .type = NLA_STRING, .len = IFNAMSIZ },

	[TCA_IPT_TABLE]	= { .type = NLA_STRING, .len = IFNAMSIZ },
@@ -187,7 +190,7 @@ err2: 
	kfree(tname);

	kfree(tname);

err1:

err1:

	if (ret == ACT_P_CREATED)

	if (ret == ACT_P_CREATED)

		tcf_idr_cleanup(*a, est);

		tcf_idr_release(*a, bind);

	return err;

	return err;

}

}

net/sched/act_pedit.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, 
		p = to_pedit(*a);

		p = to_pedit(*a);

		keys = kmalloc(ksize, GFP_KERNEL);

		keys = kmalloc(ksize, GFP_KERNEL);

		if (keys == NULL) {

		if (keys == NULL) {

			tcf_idr_cleanup(*a, est);

			tcf_idr_release(*a, bind);

			kfree(keys_ex);

			kfree(keys_ex);

			return -ENOMEM;

			return -ENOMEM;

		}

		}

net/sched/act_police.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ failure: 
	qdisc_put_rtab(P_tab);

	qdisc_put_rtab(P_tab);

	qdisc_put_rtab(R_tab);

	qdisc_put_rtab(R_tab);

	if (ret == ACT_P_CREATED)

	if (ret == ACT_P_CREATED)

		tcf_idr_cleanup(*a, est);

		tcf_idr_release(*a, bind);

	return err;

	return err;

}

}

net/sched/act_simple.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla, 
		d = to_defact(*a);

		d = to_defact(*a);

		ret = alloc_defdata(d, defdata);

		ret = alloc_defdata(d, defdata);

		if (ret < 0) {

		if (ret < 0) {

			tcf_idr_cleanup(*a, est);

			tcf_idr_release(*a, bind);

			return ret;

			return ret;

		}

		}

		d->tcf_action = parm->action;

		d->tcf_action = parm->action;

CRA Git | Maintained and supported by SUSTech CRA and CCSE