4.9-stable patches

added patches:
	net-fec_ptp-add-clock-rate-zero-check.patch

diff --git a/queue-4.9/net-fec_ptp-add-clock-rate-zero-check.patch b/queue-4.9/net-fec_ptp-add-clock-rate-zero-check.patch
new file mode 100644 (file)
index 0000000..3040ee1
--- /dev/null
+++ b/queue-4.9/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 <fugang.duan@nxp.com>
+Date: Wed, 16 Jun 2021 17:14:25 +0800
+Subject: net: fec_ptp: add clock rate zero check
+
+From: Fugang Duan <fugang.duan@nxp.com>
+
+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 <fugang.duan@nxp.com>
+Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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.9/series b/queue-4.9/series
index 617407017b94d9094296ae84391c0d91ab9dba02..7c81160606714c0f4ff357c6047dca8f85e8cdff 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -41,3 +41,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