From: Greg Kroah-Hartman Date: Mon, 21 Jun 2021 14:02:33 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.4.128~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a663a116cdb54311137ba0d68b2b96672da51d5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: net-fec_ptp-add-clock-rate-zero-check.patch --- diff --git a/queue-4.4/net-fec_ptp-add-clock-rate-zero-check.patch b/queue-4.4/net-fec_ptp-add-clock-rate-zero-check.patch new file mode 100644 index 00000000000..3040ee1a450 --- /dev/null +++ b/queue-4.4/net-fec_ptp-add-clock-rate-zero-check.patch @@ -0,0 +1,33 @@ +From cb3cefe3f3f8af27c6076ef7d1f00350f502055d Mon Sep 17 00:00:00 2001 +From: Fugang Duan +Date: Wed, 16 Jun 2021 17:14:25 +0800 +Subject: net: fec_ptp: add clock rate zero check + +From: Fugang Duan + +commit cb3cefe3f3f8af27c6076ef7d1f00350f502055d upstream. + +Add clock rate zero check to fix coverity issue of "divide by 0". + +Fixes: commit 85bd1798b24a ("net: fec: fix spin_lock dead lock") +Signed-off-by: Fugang Duan +Signed-off-by: Joakim Zhang +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/freescale/fec_ptp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/ethernet/freescale/fec_ptp.c ++++ b/drivers/net/ethernet/freescale/fec_ptp.c +@@ -586,6 +586,10 @@ void fec_ptp_init(struct platform_device + fep->ptp_caps.enable = fec_ptp_enable; + + fep->cycle_speed = clk_get_rate(fep->clk_ptp); ++ if (!fep->cycle_speed) { ++ fep->cycle_speed = NSEC_PER_SEC; ++ dev_err(&fep->pdev->dev, "clk_ptp clock rate is zero\n"); ++ } + fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed; + + spin_lock_init(&fep->tmreg_lock); diff --git a/queue-4.4/series b/queue-4.4/series index 0ebb6d206dd..806b27e3744 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -34,3 +34,4 @@ pci-mark-ti-c667x-to-avoid-bus-reset.patch pci-mark-some-nvidia-gpus-to-avoid-bus-reset.patch arcv2-save-abi-registers-across-signal-handling.patch dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch +net-fec_ptp-add-clock-rate-zero-check.patch