[PATCH net-next] liquidio: fix Smatch error

Subsystems: cavium liquidio network driver, networking drivers, the rest

STALE3344d

2 messages, 2 authors, 2017-08-18 · open the first message on its own page

[PATCH net-next] liquidio: fix Smatch error

From: Felix Manlunas <hidden>
Date: 2017-08-18 20:07:09

From: Intiyaz Basha <redacted>

Fix Smatch error by not dereferencing iq pointer if it's NULL.

See http://marc.info/?l=kernel-janitors&m=150296723301129&w=2

Also, remove unnecessary parentheses.

Fixes: d314ac222829 ("liquidio: moved liquidio_napi_poll to lio_core.c")
Reported-by: Dan Carpenter <redacted>
Signed-off-by: Intiyaz Basha <redacted>
Signed-off-by: Felix Manlunas <redacted>
---
 drivers/net/ethernet/cavium/liquidio/lio_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c
index d4f0646..0e7896c 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_core.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c
@@ -668,8 +668,8 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget)
 
 #define MAX_REG_CNT  2000000U
 	/* force enable interrupt if reg cnts are high to avoid wraparound */
-	if (((work_done < budget) && (tx_done)) ||
-	    (iq->pkt_in_done >= MAX_REG_CNT) ||
+	if ((work_done < budget && tx_done) ||
+	    (iq && iq->pkt_in_done >= MAX_REG_CNT) ||
 	    (droq->pkt_count >= MAX_REG_CNT)) {
 		tx_done = 1;
 		napi_complete_done(napi, work_done);
-- 
1.8.3.1

Re: [PATCH net-next] liquidio: fix Smatch error

From: David Miller <davem@davemloft.net>
Date: 2017-08-18 22:21:35

From: Felix Manlunas <redacted>
Date: Fri, 18 Aug 2017 13:07:19 -0700
From: Intiyaz Basha <redacted>

Fix Smatch error by not dereferencing iq pointer if it's NULL.

See http://marc.info/?l=kernel-janitors&m=150296723301129&w=2

Also, remove unnecessary parentheses.

Fixes: d314ac222829 ("liquidio: moved liquidio_napi_poll to lio_core.c")
Reported-by: Dan Carpenter <redacted>
Signed-off-by: Intiyaz Basha <redacted>
Signed-off-by: Felix Manlunas <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help