Skip to content

Commit

Permalink
net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule
Browse files Browse the repository at this point in the history
[ Upstream commit ed8157f ]

There is a reproducible sequence from the userland that will trigger a WARN_ON()
condition in taprio_get_start_time, which causes kernel to panic if configured
as "panic_on_warn". Catch this condition in parse_taprio_schedule to
prevent this condition.

Reported as bug on syzkaller:
https://syzkaller.appspot.com/bug?extid=d50710fd0873a9c6b40c

Reported-by: syzbot+d50710fd0873a9c6b40c@syzkaller.appspotmail.com
Signed-off-by: Du Cheng <ducheng2@gmail.com>
Acked-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Du Cheng authored and gregkh committed May 19, 2021
1 parent 05916c6 commit d4b0dc3
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions net/sched/sch_taprio.c
Expand Up @@ -900,6 +900,12 @@ static int parse_taprio_schedule(struct taprio_sched *q, struct nlattr **tb,

list_for_each_entry(entry, &new->entries, list)
cycle = ktime_add_ns(cycle, entry->interval);

if (!cycle) {
NL_SET_ERR_MSG(extack, "'cycle_time' can never be 0");
return -EINVAL;
}

new->cycle_time = cycle;
}

Expand Down

0 comments on commit d4b0dc3

Please sign in to comment.