| Message ID | 1465850654-27128-1-git-send-email-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 16-06-13 04:44 PM, Cong Wang wrote: > 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> Good catch. Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> cheers, jamal
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Mon, 13 Jun 2016 13:44:14 -0700 > 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> Applied, and queued up for -stable.
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 9f002ad..d4bd19e 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)
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> --- net/sched/act_ipt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)