Skip to content

Commit 4d07c59

Browse files
Hao Chendavem330
authored andcommitted
net: hns3: add NULL pointer check for hns3_set/get_ringparam()
When pci devices init failed and haven't reinit, priv->ring is NULL and hns3_set/get_ringparam() will access priv->ring. it causes call trace. So, add NULL pointer check for hns3_set/get_ringparam() to avoid this situation. Fixes: 5668abd ("net: hns3: add support for set_ringparam") Signed-off-by: Hao Chen <chenhao288@hisilicon.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent f5cd601 commit 4d07c59

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ static void hns3_get_ringparam(struct net_device *netdev,
653653
struct hnae3_handle *h = priv->ae_handle;
654654
int rx_queue_index = h->kinfo.num_tqps;
655655

656-
if (hns3_nic_resetting(netdev)) {
657-
netdev_err(netdev, "dev resetting!");
656+
if (hns3_nic_resetting(netdev) || !priv->ring) {
657+
netdev_err(netdev, "failed to get ringparam value, due to dev resetting or uninited\n");
658658
return;
659659
}
660660

@@ -1074,8 +1074,14 @@ static int hns3_check_ringparam(struct net_device *ndev,
10741074
{
10751075
#define RX_BUF_LEN_2K 2048
10761076
#define RX_BUF_LEN_4K 4096
1077-
if (hns3_nic_resetting(ndev))
1077+
1078+
struct hns3_nic_priv *priv = netdev_priv(ndev);
1079+
1080+
if (hns3_nic_resetting(ndev) || !priv->ring) {
1081+
netdev_err(ndev, "failed to set ringparam value, due to dev resetting or uninited\n");
10781082
return -EBUSY;
1083+
}
1084+
10791085

10801086
if (param->rx_mini_pending || param->rx_jumbo_pending)
10811087
return -EINVAL;

0 commit comments

Comments
 (0)