From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E7B2C47409 for ; Thu, 16 Jan 2020 18:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E431E2077B for ; Thu, 16 Jan 2020 18:38:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579199934; bh=8FK7pR8uE9doo6gMvke7PDQVUkNaOo7OBDbXcEqK7vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lsn9O+nXlwAbH/Wj4Fvcvy9Xu/7gg3MPmz0+JcGBdvtc94n8cJjqH2EobxqHZ4OZH Tkc8J6bL9YBIBbOQMtezebvamNo76dl2yjfSDh5mTKybMXX3jn7tl/0/C/fLGNEYzG clCWGLdPksNZ8DBMtNdhgyGuzijzQpsVsc7BuPK0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436914AbgAPSiw (ORCPT ); Thu, 16 Jan 2020 13:38:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:54892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390417AbgAPRMW (ORCPT ); Thu, 16 Jan 2020 12:12:22 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F2EAC24684; Thu, 16 Jan 2020 17:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194742; bh=8FK7pR8uE9doo6gMvke7PDQVUkNaOo7OBDbXcEqK7vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X8lRaGgJsee9eN1nJ/iCMNxfiR1S/xVwdn9dB8LhAjd8pU1gwsYCeY66nXfjcvlSI mVGQH93n+kNE/Mc4EooovNDL6R4S6WHtHw36/4xESGe4+vwN3zRIbDNn0zno346gR/ Q/Z7jzmvHvB78va+VHFZU02dwr7rxZC5vf9GvP/I= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Oltean , Vinicius Costa Gomes , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 572/671] net: sched: cbs: Avoid division by zero when calculating the port rate Date: Thu, 16 Jan 2020 12:03:30 -0500 Message-Id: <20200116170509.12787-309-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean [ 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 Acked-by: Vinicius Costa Gomes Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sched/sch_cbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- 2.20.1