summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorVladimir Oltean <olteanv@gmail.com>2019-09-29 02:39:48 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-27 14:51:16 +0100
commit172c529cb00acc367426a3aab72ceb8d3c742ca5 (patch)
treece58186034c15895befb763331186e8e87c218b1 /net/sched
parent13260106d33a5d23c731f240eb56b799102ab286 (diff)
net: sched: cbs: Avoid division by zero when calculating the port rate
[ Upstream commit 83c8c3cf45163f0c823db37be6ab04dfcf8ac751 ] As explained in the "net: sched: taprio: Avoid division by zero on invalid link speed" commit, it is legal for the ethtool API to return zero as a link speed. So guard against it to ensure we don't perform a division by zero in kernel. Fixes: e0a7683d30e9 ("net/sched: cbs: fix port_rate miscalculation") Signed-off-by: Vladimir Oltean <olteanv@gmail.com> Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_cbs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index 289f66b9238d..940e72d6db18 100644
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -310,7 +310,7 @@ static void cbs_set_port_rate(struct net_device *dev, struct cbs_sched_data *q)
if (err < 0)
goto skip;
- if (ecmd.base.speed != SPEED_UNKNOWN)
+ if (ecmd.base.speed && ecmd.base.speed != SPEED_UNKNOWN)
speed = ecmd.base.speed;
skip: