2019-08-06 22:46:36

by Ivan Khoronzhuk

Subject: [PATCH v2] net: sched: sch_taprio: fix memleak in error path for sched list parse

In error case, all entries should be freed from the sched list
before deleting it. For simplicity use rcu way.

Fixes: 5a781ccbd19e46 ("tc: Add support for configuring the taprio scheduler")
Acked-by: Vinicius Costa Gomes <[email protected]>
Signed-off-by: Ivan Khoronzhuk <[email protected]>
---
net/sched/sch_taprio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index c39db507ba3f..e25d414ae12f 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -1195,7 +1195,8 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
spin_unlock_bh(qdisc_lock(sch));

free_sched:
- kfree(new_admin);
+ if (new_admin)
+ call_rcu(&new_admin->rcu, taprio_free_sched_cb);

return err;
}
--
2.17.1

2019-08-09 05:08:26

by David Miller

Subject: Re: [PATCH v2] net: sched: sch_taprio: fix memleak in error path for sched list parse

From: Ivan Khoronzhuk <[email protected]>
Date: Wed, 7 Aug 2019 01:45:40 +0300

> In error case, all entries should be freed from the sched list
> before deleting it. For simplicity use rcu way.
>
> Fixes: 5a781ccbd19e46 ("tc: Add support for configuring the taprio scheduler")
> Acked-by: Vinicius Costa Gomes <[email protected]>
> Signed-off-by: Ivan Khoronzhuk <[email protected]>

Applied and queued up for -stable, thank you.