Messages in this thread | | | Subject | Re: [PATCH 1/1] net: hns: avoid null pointer dereference | From | Yisen Zhuang <> | Date | Wed, 18 May 2016 09:04:07 +0800 |
| |
Hi Heinrich,
This patch is fine to me.
Thanks,
Yisen
在 2016/5/18 4:01, Heinrich Schuchardt 写道: > In the statement > assert(priv || priv->ae_handle); > the right side of || is only evaluated if priv is null. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > index 3d746c8..834a50a 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > @@ -720,7 +720,7 @@ static int hns_set_pauseparam(struct net_device *net_dev, > struct hnae_handle *h; > struct hnae_ae_ops *ops; > > - assert(priv || priv->ae_handle); > + assert(priv && priv->ae_handle); > > h = priv->ae_handle; > ops = h->dev->ops; > @@ -780,7 +780,7 @@ static int hns_set_coalesce(struct net_device *net_dev, > struct hnae_ae_ops *ops; > int ret; > > - assert(priv || priv->ae_handle); > + assert(priv && priv->ae_handle); > > ops = priv->ae_handle->dev->ops; > > @@ -1111,7 +1111,7 @@ 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); > + assert(priv && priv->ae_handle); > > ops = priv->ae_handle->dev->ops; > > @@ -1135,7 +1135,7 @@ 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); > + assert(priv && priv->ae_handle); > > ops = priv->ae_handle->dev->ops; > if (!ops->get_regs_len) { >
| |