| Message ID | 1483458422-13607-1-git-send-email-yotamg@mellanox.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Yotam Gigi <yotamg@mellanox.com> Date: Tue, 3 Jan 2017 17:47:02 +0200 > Fix several error paths in matchall: > - Release reference to actions in case the hardware fails offloading > (relevant to skip_sw only) > - Fix error path in case tcf_exts initialization fails > > Fixes: bf3994d2ed31 ("net/sched: introduce Match-all classifier") > Signed-off-by: Yotam Gigi <yotamg@mellanox.com> Nothing is checking the tcf_exts_init() return value for errors either, and I think you should fix this alongside these release problems at the same time. Thanks.
>-----Original Message----- >From: David Miller [mailto:davem@davemloft.net] >Sent: Tuesday, January 03, 2017 6:08 PM >To: Yotam Gigi <yotamg@mellanox.com> >Cc: jhs@mojatatu.com; Elad Raz <eladr@mellanox.com>; Jiri Pirko ><jiri@mellanox.com>; netdev@vger.kernel.org >Subject: Re: [PATCH net-next] net/sched: cls_matchall: Fix error path > >From: Yotam Gigi <yotamg@mellanox.com> >Date: Tue, 3 Jan 2017 17:47:02 +0200 > >> Fix several error paths in matchall: >> - Release reference to actions in case the hardware fails offloading >> (relevant to skip_sw only) >> - Fix error path in case tcf_exts initialization fails >> >> Fixes: bf3994d2ed31 ("net/sched: introduce Match-all classifier") >> Signed-off-by: Yotam Gigi <yotamg@mellanox.com> > >Nothing is checking the tcf_exts_init() return value for errors either, >and I think you should fix this alongside these release problems at the >same time. Ok. Will send v2 soon. Thanks! > >Thanks.
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c index f935429..ce7d28b 100644 --- a/net/sched/cls_matchall.c +++ b/net/sched/cls_matchall.c @@ -144,7 +144,7 @@ static int mall_set_parms(struct net *net, struct tcf_proto *tp, tcf_exts_init(&e, TCA_MATCHALL_ACT, 0); err = tcf_exts_validate(net, tp, tb, est, &e, ovr); if (err < 0) - return err; + goto errout; if (tb[TCA_MATCHALL_CLASSID]) { f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]); @@ -154,6 +154,9 @@ static int mall_set_parms(struct net *net, struct tcf_proto *tp, tcf_exts_change(tp, &f->exts, &e); return 0; +errout: + tcf_exts_destroy(&e); + return err; } static int mall_change(struct net *net, struct sk_buff *in_skb, @@ -220,6 +223,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, return 0; errout: + tcf_exts_destroy(&f->exts); kfree(f); return err; }
Fix several error paths in matchall: - Release reference to actions in case the hardware fails offloading (relevant to skip_sw only) - Fix error path in case tcf_exts initialization fails Fixes: bf3994d2ed31 ("net/sched: introduce Match-all classifier") Signed-off-by: Yotam Gigi <yotamg@mellanox.com> --- net/sched/cls_matchall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)