Thread (6 messages) flat view 6 messages, 4 authors, 2016-05-23

RE: [PATCH 1/1] net: hns: avoid null pointer dereference

From: David Laight <hidden>
Date: 2016-05-19 11:17:08
Also in: lkml

From: Heinrich Schuchardt
quoted hunk ↗ jump to hunk
Sent: 17 May 2016 21:01
In the statement
  assert(priv || priv->ae_handle);
the right side of || is only evaluated if priv is null.

Signed-off-by: Heinrich Schuchardt <redacted>
---
 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;
...

Personally I'd just delete the assert().
It is probably easier to debug the 'oops' from the NULL pointer dereference
that that of the assert().
If either value can be NULL (without a coding error) then you'd want to
return an error.

	David
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help