[dpdk-dev] [PATCH 05/12] net/bnxt: Validate structs and pointers before use

[Ajit Khaparde]

From: Rahul Gupta <rahul.gu...@broadcom.com>

Validate pointers aren't pointing to uninitialized areas
including txq and rxq before using them to avoid
bnxt driver from crashing.

Signed-off-by: Rahul Gupta <rahul.gu...@broadcom.com>
Signed-off-by: Jay Ding <jay.d...@broadcom.com>
Signed-off-by: Scott Branden <scott.bran...@broadcom.com>
Reviewed-by: Ray Jui <ray....@broadcom.com>
Reviewed-by: Ajit Kumar Khaparde <ajit.khapa...@broadcom.com>
Reviewed-by: Randy Schacher <stuart.schac...@broadcom.com>
Tested-by: Randy Schacher <stuart.schac...@broadcom.com>
---
 drivers/net/bnxt/bnxt_ring.c | 3 +++
 drivers/net/bnxt/bnxt_rxq.c  | 6 ++----
 drivers/net/bnxt/bnxt_txq.c  | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 8e822e11f..aa9f3f4cc 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -24,6 +24,9 @@
 
 void bnxt_free_ring(struct bnxt_ring *ring)
 {
+       if (!ring)
+               return;
+
        if (ring->vmem_size && *ring->vmem) {
                memset((char *)*ring->vmem, 0, ring->vmem_size);
                *ring->vmem = NULL;
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 4e6fa4e30..4b380d4f0 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -23,10 +23,8 @@
 
 void bnxt_free_rxq_stats(struct bnxt_rx_queue *rxq)
 {
-       struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
-
-       if (cpr->hw_stats)
-               cpr->hw_stats = NULL;
+       if (rxq && rxq->cp_ring && rxq->cp_ring->hw_stats)
+               rxq->cp_ring->hw_stats = NULL;
 }
 
 int bnxt_mq_rx_configure(struct bnxt *bp)
diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index b50f37cf2..b9b975e4c 100644
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -19,10 +19,8 @@
 
 void bnxt_free_txq_stats(struct bnxt_tx_queue *txq)
 {
-       struct bnxt_cp_ring_info *cpr = txq->cp_ring;
-
-       if (cpr->hw_stats)
-               cpr->hw_stats = NULL;
+       if (txq && txq->cp_ring && txq->cp_ring->hw_stats)
+               txq->cp_ring->hw_stats = NULL;
 }
 
 static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq)
@@ -30,6 +28,9 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue 
*txq)
        struct bnxt_sw_tx_bd *sw_ring;
        uint16_t i;
 
+       if (!txq)
+               return;
+
        sw_ring = txq->tx_ring->tx_buf_ring;
        if (sw_ring) {
                for (i = 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) {
-- 
2.15.1 (Apple Git-101)