Skip to content

Commit

Permalink
net: hns3: add NULL pointer check for hns3_set/get_ringparam()
Browse files Browse the repository at this point in the history
[ Upstream commit 4d07c59 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Hao Chen authored and gregkh committed Apr 8, 2022
1 parent 1ff44dd commit 74a96ae
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
Expand Up @@ -651,8 +651,8 @@ static void hns3_get_ringparam(struct net_device *netdev,
struct hnae3_handle *h = priv->ae_handle;
int rx_queue_index = h->kinfo.num_tqps;

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

Expand Down Expand Up @@ -1072,8 +1072,14 @@ static int hns3_check_ringparam(struct net_device *ndev,
{
#define RX_BUF_LEN_2K 2048
#define RX_BUF_LEN_4K 4096
if (hns3_nic_resetting(ndev))

struct hns3_nic_priv *priv = netdev_priv(ndev);

if (hns3_nic_resetting(ndev) || !priv->ring) {
netdev_err(ndev, "failed to set ringparam value, due to dev resetting or uninited\n");
return -EBUSY;
}


if (param->rx_mini_pending || param->rx_jumbo_pending)
return -EINVAL;
Expand Down

0 comments on commit 74a96ae

Please sign in to comment.