summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2015-07-30 17:12:21 -0700
committerDavid S. Miller <davem@davemloft.net>2015-07-31 15:22:34 -0700
commit5175f7106cc55a1bcf97bf7d5ba0900017ebcef8 (patch)
tree9f3ccc13ff8fb73a9a260d99ea2276f3f43bf09f /net/sched
parent8a68173691f036613e3d4e6bf8dc129d4a7bf383 (diff)
downloadlinux-5175f7106cc55a1bcf97bf7d5ba0900017ebcef8.tar.gz
linux-5175f7106cc55a1bcf97bf7d5ba0900017ebcef8.tar.bz2
linux-5175f7106cc55a1bcf97bf7d5ba0900017ebcef8.zip
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>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/act_pedit.c5
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,
}
ret = ACT_P_CREATED;
} else {
- p = to_pedit(a);
- tcf_hash_release(a, bind);
if (bind)
return 0;
+ tcf_hash_release(a, bind);
if (!ovr)
return -EEXIST;
-
+ p = to_pedit(a);
if (p->tcfp_nkeys && p->tcfp_nkeys != parm->nkeys) {
keys = kmalloc(ksize, GFP_KERNEL);
if (keys == NULL)