From: Vladimir Oltean <olteanv@gmail.com>
To: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us,
davem@davemloft.net, vinicius.gomes@intel.com,
vedang.patel@intel.com, leandro.maciel.dorileo@intel.com
Cc: netdev@vger.kernel.org, Vladimir Oltean <olteanv@gmail.com>
Subject: [PATCH net 1/3] taprio: Fix kernel panic in taprio_destroy
Date: Wed, 28 Aug 2019 17:48:27 +0300 [thread overview]
Message-ID: <20190828144829.32570-2-olteanv@gmail.com> (raw)
In-Reply-To: <20190828144829.32570-1-olteanv@gmail.com>
taprio_init may fail earlier than this line:
list_add(&q->taprio_list, &taprio_list);
i.e. due to the net device not being multi queue.
Attempting to remove q from the global taprio_list when it is not part
of it will result in a kernel panic.
Fix it by iterating through the list and removing it only if found.
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
---
net/sched/sch_taprio.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 540bde009ea5..f1eea8c68011 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -1199,12 +1199,17 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
static void taprio_destroy(struct Qdisc *sch)
{
- struct taprio_sched *q = qdisc_priv(sch);
+ struct taprio_sched *p, *q = qdisc_priv(sch);
struct net_device *dev = qdisc_dev(sch);
+ struct list_head *pos, *tmp;
unsigned int i;
spin_lock(&taprio_list_lock);
- list_del(&q->taprio_list);
+ list_for_each_safe(pos, tmp, &taprio_list) {
+ p = list_entry(pos, struct taprio_sched, taprio_list);
+ if (p == q)
+ list_del(&q->taprio_list);
+ }
spin_unlock(&taprio_list_lock);
hrtimer_cancel(&q->advance_timer);
--
2.17.1
next prev parent reply other threads:[~2019-08-28 14:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 14:48 [PATCH net 0/3] Fix issues in tc-taprio and tc-cbs Vladimir Oltean
2019-08-28 14:48 ` Vladimir Oltean [this message]
2019-08-28 16:31 ` [PATCH net 1/3] taprio: Fix kernel panic in taprio_destroy Vinicius Costa Gomes
2019-08-28 16:51 ` Vladimir Oltean
2019-08-28 17:38 ` Vinicius Costa Gomes
2019-08-30 0:07 ` David Miller
2019-08-28 14:48 ` [PATCH net 2/3] taprio: Set default link speed to 10 Mbps in taprio_set_picos_per_byte Vladimir Oltean
2019-08-28 16:42 ` Vinicius Costa Gomes
2019-08-28 14:48 ` [PATCH net 3/3] net/sched: cbs: Set default link speed to 10 Mbps in cbs_set_port_rate Vladimir Oltean
2019-08-28 16:45 ` Vinicius Costa Gomes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828144829.32570-2-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=davem@davemloft.net \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=leandro.maciel.dorileo@intel.com \
--cc=netdev@vger.kernel.org \
--cc=vedang.patel@intel.com \
--cc=vinicius.gomes@intel.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).