net: hns3: Fix potential null pointer defererence of null ae_dev

The reset_prepare and reset_done calls have a null pointer check
on ae_dev however ae_dev is being dereferenced via the call to
ns3_is_phys_func with the ae->pdev argument. Fix this by performing
a null pointer check on ae_dev and hence short-circuiting the
dereference to ae_dev on the call to ns3_is_phys_func.

Addresses-Coverity: ("Dereference before null check")
Fixes: 715c58e94f0d ("net: hns3: add suspend and resume pm_ops")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 25afe5a3348ce1ff186056577dac0837ef09d440..c21dd11baed913447ba10ae935b836c8f5146597 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2369,9 +2369,9 @@ static int __maybe_unused hns3_suspend(struct device *dev)
 {
        struct hnae3_ae_dev *ae_dev = dev_get_drvdata(dev);
 
-       if (hns3_is_phys_func(ae_dev->pdev)) {
+       if (ae_dev && hns3_is_phys_func(ae_dev->pdev)) {
                dev_info(dev, "Begin to suspend.\n");
-               if (ae_dev && ae_dev->ops && ae_dev->ops->reset_prepare)
+               if (ae_dev->ops && ae_dev->ops->reset_prepare)
                        ae_dev->ops->reset_prepare(ae_dev, HNAE3_FUNC_RESET);
        }
 
@@ -2382,9 +2382,9 @@ static int __maybe_unused hns3_resume(struct device *dev)
 {
        struct hnae3_ae_dev *ae_dev = dev_get_drvdata(dev);
 
-       if (hns3_is_phys_func(ae_dev->pdev)) {
+       if (ae_dev && hns3_is_phys_func(ae_dev->pdev)) {
                dev_info(dev, "Begin to resume.\n");
-               if (ae_dev && ae_dev->ops && ae_dev->ops->reset_done)
+               if (ae_dev->ops && ae_dev->ops->reset_done)
                        ae_dev->ops->reset_done(ae_dev);
        }