[PATCH] net/cxgbe: fix NULL deref in CLIP failure path

[PATCH] net/cxgbe: fix NULL deref in CLIP failure path

[Rahul Lakkireddy]

From: Shagun Agrawal <shaguna@chelsio.com>

Fixes: 3f2c1e20 ("net/cxgbe: add Compressed Local IP region")
Coverity issue: 302872

Signed-off-by: Shagun Agrawal <shaguna@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
 drivers/net/cxgbe/clip_tbl.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/cxgbe/clip_tbl.c b/drivers/net/cxgbe/clip_tbl.c
index fa5281cd4..5e4dc5270 100644
--- a/drivers/net/cxgbe/clip_tbl.c
+++ b/drivers/net/cxgbe/clip_tbl.c
@@ -105,7 +105,7 @@ static struct clip_entry *t4_clip_alloc(struct rte_eth_dev *dev,
 	struct adapter *adap = ethdev2adap(dev);
 	struct clip_tbl *ctbl = adap->clipt;
 	struct clip_entry *ce;
-	int ret;
+	int ret = 0;
 
 	if (!ctbl)
 		return NULL;
@@ -120,12 +120,10 @@ static struct clip_entry *t4_clip_alloc(struct rte_eth_dev *dev,
 				ce->type = FILTER_TYPE_IPV6;
 				rte_atomic32_set(&ce->refcnt, 1);
 				ret = clip6_get_mbox(dev, lip);
-				if (ret) {
+				if (ret)
 					dev_debug(adap,
 						  "CLIP FW ADD CMD failed: %d",
 						  ret);
-					ce = NULL;
-				}
 			} else {
 				ce->type = FILTER_TYPE_IPV4;
 			}
@@ -136,7 +134,7 @@ static struct clip_entry *t4_clip_alloc(struct rte_eth_dev *dev,
 	}
 	t4_os_write_unlock(&ctbl->lock);
 
-	return ce;
+	return ret ? NULL : ce;
 }
 
 /**
-- 
2.14.1

Re: [PATCH] net/cxgbe: fix NULL deref in CLIP failure path

[Thomas Monjalon]

26/07/2018 10:19, Rahul Lakkireddy:
> From: Shagun Agrawal <shaguna@chelsio.com>
> 
> Fixes: 3f2c1e20 ("net/cxgbe: add Compressed Local IP region")
> Coverity issue: 302872
> 
> Signed-off-by: Shagun Agrawal <shaguna@chelsio.com>
> Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>

Applied, thanks