diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2015-07-30 20:12:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-07-31 18:22:34 -0400 |
commit | 5175f7106cc55a1bcf97bf7d5ba0900017ebcef8 (patch) | |
tree | 9f3ccc13ff8fb73a9a260d99ea2276f3f43bf09f | |
parent | 8a68173691f036613e3d4e6bf8dc129d4a7bf383 (diff) |
act_pedit: check binding before calling tcf_hash_release()
When we share an action within a filter, the bind refcnt
should increase, therefore we should not call tcf_hash_release().
Fixes: 1a29321ed045 ("net_sched: act: Dont increment refcnt on replace")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sched/act_pedit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 17e6d6669c7f..ff8b466a73f6 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c | |||
@@ -68,13 +68,12 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, | |||
68 | } | 68 | } |
69 | ret = ACT_P_CREATED; | 69 | ret = ACT_P_CREATED; |
70 | } else { | 70 | } else { |
71 | p = to_pedit(a); | ||
72 | tcf_hash_release(a, bind); | ||
73 | if (bind) | 71 | if (bind) |
74 | return 0; | 72 | return 0; |
73 | tcf_hash_release(a, bind); | ||
75 | if (!ovr) | 74 | if (!ovr) |
76 | return -EEXIST; | 75 | return -EEXIST; |
77 | 76 | p = to_pedit(a); | |
78 | if (p->tcfp_nkeys && p->tcfp_nkeys != parm->nkeys) { | 77 | if (p->tcfp_nkeys && p->tcfp_nkeys != parm->nkeys) { |
79 | keys = kmalloc(ksize, GFP_KERNEL); | 78 | keys = kmalloc(ksize, GFP_KERNEL); |
80 | if (keys == NULL) | 79 | if (keys == NULL) |