net: hns: avoid null pointer dereference
In the statement assert(priv || priv->ae_handle); the right side of || is only evaluated if priv is null. v2: As suggested by David Leight and David Miller the assert statements are removed. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c685293aa3
commit
8da07a393f
|
@ -46,7 +46,6 @@ static u32 hns_nic_get_link(struct net_device *net_dev)
|
|||
u32 link_stat = priv->link;
|
||||
struct hnae_handle *h;
|
||||
|
||||
assert(priv && priv->ae_handle);
|
||||
h = priv->ae_handle;
|
||||
|
||||
if (priv->phy) {
|
||||
|
@ -646,8 +645,6 @@ static void hns_nic_get_drvinfo(struct net_device *net_dev,
|
|||
{
|
||||
struct hns_nic_priv *priv = netdev_priv(net_dev);
|
||||
|
||||
assert(priv);
|
||||
|
||||
strncpy(drvinfo->version, HNAE_DRIVER_VERSION,
|
||||
sizeof(drvinfo->version));
|
||||
drvinfo->version[sizeof(drvinfo->version) - 1] = '\0';
|
||||
|
@ -720,8 +717,6 @@ static int hns_set_pauseparam(struct net_device *net_dev,
|
|||
struct hnae_handle *h;
|
||||
struct hnae_ae_ops *ops;
|
||||
|
||||
assert(priv || priv->ae_handle);
|
||||
|
||||
h = priv->ae_handle;
|
||||
ops = h->dev->ops;
|
||||
|
||||
|
@ -780,8 +775,6 @@ static int hns_set_coalesce(struct net_device *net_dev,
|
|||
struct hnae_ae_ops *ops;
|
||||
int ret;
|
||||
|
||||
assert(priv || priv->ae_handle);
|
||||
|
||||
ops = priv->ae_handle->dev->ops;
|
||||
|
||||
if (ec->tx_coalesce_usecs != ec->rx_coalesce_usecs)
|
||||
|
@ -1111,8 +1104,6 @@ void hns_get_regs(struct net_device *net_dev, struct ethtool_regs *cmd,
|
|||
struct hns_nic_priv *priv = netdev_priv(net_dev);
|
||||
struct hnae_ae_ops *ops;
|
||||
|
||||
assert(priv || priv->ae_handle);
|
||||
|
||||
ops = priv->ae_handle->dev->ops;
|
||||
|
||||
cmd->version = HNS_CHIP_VERSION;
|
||||
|
@ -1135,8 +1126,6 @@ static int hns_get_regs_len(struct net_device *net_dev)
|
|||
struct hns_nic_priv *priv = netdev_priv(net_dev);
|
||||
struct hnae_ae_ops *ops;
|
||||
|
||||
assert(priv || priv->ae_handle);
|
||||
|
||||
ops = priv->ae_handle->dev->ops;
|
||||
if (!ops->get_regs_len) {
|
||||
netdev_err(net_dev, "ops->get_regs_len is null!\n");
|
||||
|
|
Loading…
Reference in New Issue
Block a user