| From foo@baz Wed Jul 6 16:50:56 PDT 2016 |
| From: WANG Cong <xiyou.wangcong@gmail.com> |
| Date: Mon, 13 Jun 2016 13:44:14 -0700 |
| Subject: act_ipt: fix a bind refcnt leak |
| |
| From: WANG Cong <xiyou.wangcong@gmail.com> |
| |
| [ Upstream commit d15eccea69b96a5116169688dcc9baf6d1ce2751 ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/sched/act_ipt.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/net/sched/act_ipt.c |
| +++ b/net/sched/act_ipt.c |
| @@ -121,10 +121,13 @@ static int __tcf_ipt_init(struct tc_acti |
| } |
| |
| 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) |
