From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eelco Chaudron Subject: Re: [patch net resend] net: sched: cbq: create block for q->link.block Date: Tue, 28 Nov 2017 10:16:20 +0100 Message-ID: References: <20171127173721.1327-1-jiri@resnulli.us> Reply-To: echaudro@redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, mlxsw@mellanox.com, jaster@redhat.com, ivecera@redhat.com To: Jiri Pirko , netdev@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:41554 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750871AbdK1JQX (ORCPT ); Tue, 28 Nov 2017 04:16:23 -0500 In-Reply-To: <20171127173721.1327-1-jiri@resnulli.us> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 27/11/17 18:37, 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: > $ tc qdisc add dev eth0 root handle 1: cbq avpkt 1000 rate 1000Mbit bandwidth 1000Mbit > $ tc filter add dev eth0 parent 1: protocol ip prio 100 u32 match ip protocol 0 0x00 flowid 1:1 > > 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; I was about to submit a similar patch... Acked-by: Eelco Chaudron