net_sched: some fixes for cls_tcindex
Subsystems (3)
v2 cover net_sched: some fixes for cls_tcindex
This patchset contains 3 bug fixes for tcindex filter. Please check each patch for details.
v2: fix a compile error in patch 2
drop netns refcnt in patch 1
Cong Wang (3):
net_sched: fix a race condition in tcindex_destroy()
net_sched: fix a memory leak in cls_tcindex
net_sched: fix two more memory leaks in cls_tcindex
net/sched/cls_tcindex.c | 80 ++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 32 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/3 net_sched: fix a race condition in tcindex_destroy()
tcindex_destroy() invokes tcindex_destroy_element() via a walker to delete each filter result in its perfect hash table, and tcindex_destroy_element() calls tcindex_delete() which schedules tcf RCU works to do the final deletion work. Unfortunately this races with the RCU callback __tcindex_destroy(), which could lead to use-after-free as reported by Adrian.
Fix this by migrating this RCU callback to tcf RCU work too, as that workqueue is ordered, we will not have use-after-free.
Note, we don't need to hold netns refcnt because we don't call tcf_exts_destroy() here.
--- net/sched/cls_tcindex.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
net/sched/cls_tcindex.c +11 -7
@@ -48,7 +48,7 @@ struct tcindex_data {u32 hash;/* hash table size; 0 if undefined */ u32 alloc_hash;/* allocated size */ u32 fall_through;/* 0: only classify if explicit match */ -struct rcu_head rcu; +struct rcu_work rwork; };static inline int tcindex_filter_is_set (struct tcindex_filter_result *r)
@@ -229,9 +229,11 @@ static int tcindex_destroy_element(struct tcf_proto *tp,return tcindex_delete (tp, arg, &last,NULL ); } -static void __tcindex_destroy (struct rcu_head *head) +static void tcindex_destroy_work (struct work_struct *work) { - struct tcindex_data *p = container_of(head, struct tcindex_data, rcu); +struct tcindex_data *p =container_of (to_rcu_work (work), + struct tcindex_data, + rwork);kfree (p->perfect);kfree (p->h);
@@ -258,9 +260,11 @@ static int tcindex_filter_result_init(struct tcindex_filter_result *r)return tcf_exts_init (&r->exts,TCA_TCINDEX_ACT ,TCA_TCINDEX_POLICE ); } -static void __tcindex_partial_destroy (struct rcu_head *head) +static void tcindex_partial_destroy_work (struct work_struct *work) { - struct tcindex_data *p = container_of(head, struct tcindex_data, rcu); +struct tcindex_data *p =container_of (to_rcu_work (work), + struct tcindex_data, + rwork);kfree (p->perfect);kfree (p);
@@ -478,7 +482,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, }if (oldp) -call_rcu (&oldp->rcu, __tcindex_partial_destroy); +tcf_queue_work (&oldp->rwork, tcindex_partial_destroy_work);return 0 ; errout_alloc:
@@ -570,7 +574,7 @@ static void tcindex_destroy(struct tcf_proto *tp, walker.fn = tcindex_destroy_element;tcindex_walk (tp, &walker); -call_rcu (&p->rcu, __tcindex_destroy); +tcf_queue_work (&p->rwork, tcindex_destroy_work); }
Signature · 1 line
2.20.1
PATCH v2 2/3 net_sched: fix a memory leak in cls_tcindex
In reply to Cong WangWhen tcindex_destroy() destroys all the filter results in the perfect hash table, it invokes the walker to delete each of them. However, results with class==0 are skipped in either tcindex_walk() or tcindex_delete(), which causes a memory leak reported by kmemleak.
This patch fixes it by skipping the walker and directly deleting these filter results so we don't miss any filter result.
As a result of this change, we have to initialize exts->net properly in tcindex_alloc_perfect_hash(). For net-next, we need to consider whether we should initialize ->net in tcf_exts_init() instead, before that just directly test CONFIG_NET_CLS_ACT=y.
--- net/sched/cls_tcindex.c | 46 +++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-)
net/sched/cls_tcindex.c +30 -16
@@ -221,14 +221,6 @@ static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last,return 0 ; } -static int tcindex_destroy_element (struct tcf_proto *tp, -void *arg,struct tcf_walker *walker) -{ -bool last; - -return tcindex_delete (tp, arg, &last,NULL ); -} -static void tcindex_destroy_work (struct work_struct *work) { struct tcindex_data *p = container_of(to_rcu_work(work),
@@ -279,7 +271,7 @@ static void tcindex_free_perfect_hash(struct tcindex_data *cp)kfree (cp->perfect); } -static int tcindex_alloc_perfect_hash (struct tcindex_data *cp) +static int tcindex_alloc_perfect_hash (struct net *net,struct tcindex_data *cp) {int i, err =0 ;
@@ -293,6 +285,9 @@ static int tcindex_alloc_perfect_hash(struct tcindex_data *cp) TCA_TCINDEX_ACT, TCA_TCINDEX_POLICE);if (err <0 ) goto errout; +#ifdef CONFIG_NET_CLS_ACT + cp->perfect[i].exts.net = net; +#endif }return 0 ;
@@ -341,7 +336,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,if (p->perfect) {int i; -if (tcindex_alloc_perfect_hash (cp) <0 ) +if (tcindex_alloc_perfect_hash (net, cp) <0 ) goto errout;for (i =0 ; i < cp->hash; i++) cp->perfect[i].res = p->perfect[i].res;
@@ -410,7 +405,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, err = -ENOMEM ;if (!cp->perfect && !cp->h) {if (valid_perfect_hash (cp)) { -if (tcindex_alloc_perfect_hash (cp) <0 ) +if (tcindex_alloc_perfect_hash (net, cp) <0 ) goto errout_alloc; balloc =1 ; }else {
@@ -566,13 +561,32 @@ static void tcindex_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) {struct tcindex_data *p =rtnl_dereference (tp->root); -struct tcf_walker walker; +int i;pr_debug ("tcindex_destroy(tp %p),p %p\n" , tp, p); - walker.count =0 ; - walker.skip =0 ; - walker.fn = tcindex_destroy_element; -tcindex_walk (tp, &walker); + +if (p->perfect) { +for (i =0 ; i < p->hash; i++) { +struct tcindex_filter_result *r = p->perfect + i; + +tcf_unbind_filter (tp, &r->res); +if (tcf_exts_get_net (&r->exts)) +tcf_queue_work (&r->rwork, + tcindex_destroy_rexts_work); +else +__tcindex_destroy_rexts (r); + } + } + +for (i =0 ; p->h && i < p->hash; i++) { +struct tcindex_filter *f, *next; +bool last; + +for (f =rtnl_dereference (p->h[i]); f; f = next) { + next =rtnl_dereference (f->next); +tcindex_delete (tp, &f->result, &last,NULL ); + } + }tcf_queue_work (&p->rwork, tcindex_destroy_work); }
Signature · 1 line
2.20.1
PATCH v2 3/3 net_sched: fix two more memory leaks in cls_tcindex
In reply to Cong Wangstruct tcindex_filter_result contains two parts:
struct tcf_exts and struct tcf_result.
For the local variable 'cr', its exts part is never used but initialized without being released properly on success path. So just completely remove the exts part to fix this leak.
For the local variable 'new_filter_result', it is never properly released if not used by 'r' on success path.
--- net/sched/cls_tcindex.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
net/sched/cls_tcindex.c +7 -9
@@ -304,9 +304,9 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, struct nlattr *est, bool ovr, struct netlink_ext_ack *extack) { struct tcindex_filter_result new_filter_result, *old_r = r; -struct tcindex_filter_result cr;struct tcindex_data *cp =NULL , *oldp;struct tcindex_filter *f =NULL ;/* make gcc behave */ +struct tcf_result cr = {};int err, balloc =0 ;struct tcf_exts e;
@@ -345,13 +345,10 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, cp->h = p->h; err =tcindex_filter_result_init (&new_filter_result); -if (err <0 ) - goto errout1; - err =tcindex_filter_result_init (&cr);if (err <0 ) goto errout1;if (old_r) - cr.res = r->res; + cr = r->res;if (tb[TCA_TCINDEX_HASH ]) cp->hash =nla_get_u32 (tb[TCA_TCINDEX_HASH ]);
@@ -442,8 +439,8 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, }if (tb[TCA_TCINDEX_CLASSID ]) { - cr.res.classid =nla_get_u32 (tb[TCA_TCINDEX_CLASSID ]); -tcf_bind_filter (tp, &cr.res, base); + cr.classid =nla_get_u32 (tb[TCA_TCINDEX_CLASSID ]); +tcf_bind_filter (tp, &cr, base); }if (old_r && old_r != r) {
@@ -455,7 +452,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, } oldp = p; - r->res = cr.res; + r->res = cr;tcf_exts_change (&r->exts, &e);rcu_assign_pointer (tp->root, cp);
@@ -474,6 +471,8 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, ;/* nothing */ rcu_assign_pointer (*fp, f); + }else { +tcf_exts_destroy (&new_filter_result.exts); }if (oldp)
@@ -486,7 +485,6 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,else if (balloc ==2 )kfree (cp->h); errout1: -tcf_exts_destroy (&cr.exts);tcf_exts_destroy (&new_filter_result.exts); errout:kfree (cp);
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Cong Wang <[email protected]>
Date: Mon, 11 Feb 2019 13:06:13 -0800
Quoted 7 lines
This patchset contains 3 bug fixes for tcindex filter. Please check each patch for details.
v2: fix a compile error in patch 2
drop netns refcnt in patch 1Signed-off-by Cong Wang <[email protected]>
Series applied and queued up for -stable, thanks Cong.