* [patch net] net: sched: cbq: create block for q->link.block
@ 2017-11-27 17:22 Jiri Pirko
2017-11-27 17:30 ` Marcelo Ricardo Leitner
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Pirko @ 2017-11-27 17:22 UTC (permalink / raw)
To: netdev; +Cc: davem, jhs, xiyou.wangcong, mlxsw, jaster, ivecera
From: Jiri Pirko <jiri@mellanox.com>
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:
Reported-by: Jaroslav Aster <jaster@redhat.com>
Reported-by: Ivan Vecera <ivecera@redhat.com>
Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch net] net: sched: cbq: create block for q->link.block
2017-11-27 17:22 [patch net] net: sched: cbq: create block for q->link.block Jiri Pirko
@ 2017-11-27 17:30 ` Marcelo Ricardo Leitner
2017-11-27 17:35 ` Jiri Pirko
0 siblings, 1 reply; 3+ messages in thread
From: Marcelo Ricardo Leitner @ 2017-11-27 17:30 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, jhs, xiyou.wangcong, mlxsw, jaster, ivecera
On Mon, Nov 27, 2017 at 06:22:59PM +0100, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@mellanox.com>
>
> 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 <jaster@redhat.com>
> Reported-by: Ivan Vecera <ivecera@redhat.com>
> Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch net] net: sched: cbq: create block for q->link.block
2017-11-27 17:30 ` Marcelo Ricardo Leitner
@ 2017-11-27 17:35 ` Jiri Pirko
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2017-11-27 17:35 UTC (permalink / raw)
To: Marcelo Ricardo Leitner
Cc: netdev, davem, jhs, xiyou.wangcong, mlxsw, jaster, ivecera
Mon, Nov 27, 2017 at 06:30:43PM CET, marcelo.leitner@gmail.com wrote:
>On Mon, Nov 27, 2017 at 06:22:59PM +0100, Jiri Pirko wrote:
>> From: Jiri Pirko <jiri@mellanox.com>
>>
>> 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...? :-)
Ha, I guess that git-send-email avoids the lines starting by "#" :),
resending.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-27 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-27 17:22 [patch net] net: sched: cbq: create block for q->link.block Jiri Pirko
2017-11-27 17:30 ` Marcelo Ricardo Leitner
2017-11-27 17:35 ` Jiri Pirko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).