* [Patch net] net_sched: fix a memory leak in atm_tc_init()
@ 2020-07-09 3:13 Cong Wang
2020-07-09 19:32 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2020-07-09 3:13 UTC (permalink / raw)
To: netdev
Cc: Cong Wang, syzbot+d411cff6ab29cc2c311b, Jamal Hadi Salim, Jiri Pirko
When tcf_block_get() fails inside atm_tc_init(),
atm_tc_put() is called to release the qdisc p->link.q.
But the flow->ref prevents it to do so, as the flow->ref
is still zero.
Fix this by moving the p->link.ref initialization before
tcf_block_get().
Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
Reported-and-tested-by: syzbot+d411cff6ab29cc2c311b@syzkaller.appspotmail.com
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/sched/sch_atm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index ee12ca9f55b4..1c281cc81f57 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -553,16 +553,16 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt,
if (!p->link.q)
p->link.q = &noop_qdisc;
pr_debug("atm_tc_init: link (%p) qdisc %p\n", &p->link, p->link.q);
+ p->link.vcc = NULL;
+ p->link.sock = NULL;
+ p->link.common.classid = sch->handle;
+ p->link.ref = 1;
err = tcf_block_get(&p->link.block, &p->link.filter_list, sch,
extack);
if (err)
return err;
- p->link.vcc = NULL;
- p->link.sock = NULL;
- p->link.common.classid = sch->handle;
- p->link.ref = 1;
tasklet_init(&p->task, sch_atm_dequeue, (unsigned long)sch);
return 0;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch net] net_sched: fix a memory leak in atm_tc_init()
2020-07-09 3:13 [Patch net] net_sched: fix a memory leak in atm_tc_init() Cong Wang
@ 2020-07-09 19:32 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-07-09 19:32 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, syzbot+d411cff6ab29cc2c311b, jhs, jiri
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Wed, 8 Jul 2020 20:13:59 -0700
> When tcf_block_get() fails inside atm_tc_init(),
> atm_tc_put() is called to release the qdisc p->link.q.
> But the flow->ref prevents it to do so, as the flow->ref
> is still zero.
>
> Fix this by moving the p->link.ref initialization before
> tcf_block_get().
>
> Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
> Reported-and-tested-by: syzbot+d411cff6ab29cc2c311b@syzkaller.appspotmail.com
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Cc: Jiri Pirko <jiri@resnulli.us>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-09 19:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-09 3:13 [Patch net] net_sched: fix a memory leak in atm_tc_init() Cong Wang
2020-07-09 19:32 ` David Miller
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).