From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Fastabend Subject: Re: [Patch net-next 5/5] net_sched: clean up tcindex_set_parms() Date: Mon, 15 Sep 2014 15:09:35 -0700 Message-ID: <5417639F.10008@intel.com> References: <1410815210-6693-1-git-send-email-xiyou.wangcong@gmail.com> <1410815210-6693-6-git-send-email-xiyou.wangcong@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: john.fastabend@gmail.com, "David S. Miller" To: Cong Wang , netdev@vger.kernel.org Return-path: Received: from mga09.intel.com ([134.134.136.24]:39760 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754159AbaIOWVy (ORCPT ); Mon, 15 Sep 2014 18:21:54 -0400 In-Reply-To: <1410815210-6693-6-git-send-email-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: On 09/15/2014 02:06 PM, Cong Wang wrote: > We can move the allocation down. > > Signed-off-by: Cong Wang > --- > net/sched/cls_tcindex.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c > index 4ec99a6..688ab75 100644 > --- a/net/sched/cls_tcindex.c > +++ b/net/sched/cls_tcindex.c > @@ -229,7 +229,6 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, > struct tcindex_filter_result new_filter_result, *old_r = r; > struct tcindex_filter_result cr; > struct tcindex_data *cp, *oldp; > - struct tcindex_filter *f = NULL; /* make gcc behave */ > struct tcf_exts e; > > tcf_exts_init(&e, TCA_TCINDEX_ACT, TCA_TCINDEX_POLICE); > @@ -348,12 +347,6 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, > else > r = tcindex_lookup(cp, handle) ? : &new_filter_result; > > - if (r == &new_filter_result) { > - f = kzalloc(sizeof(*f), GFP_KERNEL); > - if (!f) > - goto errout_alloc; > - } > - It was put here to avoid having logic to unwind the state when/if the malloc fails. > if (tb[TCA_TCINDEX_CLASSID]) { > cr.res.classid = nla_get_u32(tb[TCA_TCINDEX_CLASSID]); > tcf_bind_filter(tp, &cr.res, base); > @@ -374,6 +367,11 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, > if (r == &new_filter_result) { > struct tcindex_filter *nfp; > struct tcindex_filter __rcu **fp; > + struct tcindex_filter *f; > + > + f = kzalloc(sizeof(*f), GFP_KERNEL); > + if (!f) > + goto errout_alloc; I don't think its safe to bail out here, you've already done the tcf_exts_change and rcu_assign_pointer() then you free it down below leaving tp->root corrupted? Thanks, John > > f->key = handle; > f->result = new_filter_result; >