From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Ricardo Leitner Subject: Re: [patch net] net: sched: cbq: create block for q->link.block Date: Mon, 27 Nov 2017 15:30:43 -0200 Message-ID: <20171127173043.GA3472@localhost.localdomain> References: <20171127172259.1183-1-jiri@resnulli.us> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, mlxsw@mellanox.com, jaster@redhat.com, ivecera@redhat.com To: Jiri Pirko Return-path: Received: from mx1.redhat.com ([209.132.183.28]:40406 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932180AbdK0Rar (ORCPT ); Mon, 27 Nov 2017 12:30:47 -0500 Content-Disposition: inline In-Reply-To: <20171127172259.1183-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org List-ID: On Mon, Nov 27, 2017 at 06:22:59PM +0100, Jiri Pirko wrote: > From: Jiri Pirko > > q->link.block is not initialized, that leads to EINVAL when one tries to > add filter there. So initialize it properly. > > This can be reproduced by: By...? :-) > > Reported-by: Jaroslav Aster > Reported-by: Ivan Vecera > Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure") > Signed-off-by: Jiri Pirko > --- > net/sched/sch_cbq.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c > index 6361be7..525eb3a 100644 > --- a/net/sched/sch_cbq.c > +++ b/net/sched/sch_cbq.c > @@ -1158,9 +1158,13 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt) > if ((q->link.R_tab = qdisc_get_rtab(r, tb[TCA_CBQ_RTAB])) == NULL) > return -EINVAL; > > + err = tcf_block_get(&q->link.block, &q->link.filter_list, sch); > + if (err) > + goto put_rtab; > + > err = qdisc_class_hash_init(&q->clhash); > if (err < 0) > - goto put_rtab; > + goto put_block; > > q->link.sibling = &q->link; > q->link.common.classid = sch->handle; > @@ -1194,6 +1198,9 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt) > cbq_addprio(q, &q->link); > return 0; > > +put_block: > + tcf_block_put(q->link.block); > + > put_rtab: > qdisc_put_rtab(q->link.R_tab); > return err; > -- > 2.9.5 >