korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 17:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: 715c58e94f ("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>
This commit is contained in:
Colin Ian King 2021-04-09 17:37:26 +01:00 committed by David S. Miller
parent e701a25840
commit d0494135f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -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);
}