diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-06-13 13:44:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-15 12:31:35 -0700 |
| commit | d15eccea69b96a5116169688dcc9baf6d1ce2751 (patch) | |
| tree | fa7a5ffb6152bad3d07a785d1d435eae55db2d76 /net | |
| parent | 3d7c8257d999bdf8fa77ffd9be775c7b58cc7b69 (diff) | |
| download | linux-stable-d15eccea69b96a5116169688dcc9baf6d1ce2751.tar.gz linux-stable-d15eccea69b96a5116169688dcc9baf6d1ce2751.tar.bz2 linux-stable-d15eccea69b96a5116169688dcc9baf6d1ce2751.zip | |
act_ipt: fix a bind refcnt leak
And avoid calling tcf_hash_check() twice.
Fixes: a57f19d30b2d ("net sched: ipt action fix late binding")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/act_ipt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 9f002ada7074..d4bd19ee5822 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c @@ -121,10 +121,13 @@ static int __tcf_ipt_init(struct tc_action_net *tn, struct nlattr *nla, } td = (struct xt_entry_target *)nla_data(tb[TCA_IPT_TARG]); - if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size) + if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size) { + if (exists) + tcf_hash_release(a, bind); return -EINVAL; + } - if (!tcf_hash_check(tn, index, a, bind)) { + if (!exists) { ret = tcf_hash_create(tn, index, est, a, sizeof(*ipt), bind, false); if (ret) |