From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com,
Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,
Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
Subject: [dpdk-dev] [PATCH 12/15] net/bnxt: fix accessing variable before null check
Date: Sun, 1 Sep 2019 15:12:16 -0700 [thread overview]
Message-ID: <20190901221213.92149-13-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20190901221213.92149-1-ajit.khaparde@broadcom.com>
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Check input argument "rxq" in bnxt_rx_queue_release_mbufs(), to be sure
variable is not NULL before accessing it.
Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop")
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_rxq.c | 55 +++++++++++++++++++------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 8492cf55e..d6bca7fd4 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -207,41 +207,42 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq)
struct bnxt_tpa_info *tpa_info;
uint16_t i;
+ if (!rxq)
+ return;
+
rte_spinlock_lock(&rxq->lock);
- if (rxq) {
- sw_ring = rxq->rx_ring->rx_buf_ring;
- if (sw_ring) {
- for (i = 0;
- i < rxq->rx_ring->rx_ring_struct->ring_size; i++) {
- if (sw_ring[i].mbuf) {
- rte_pktmbuf_free_seg(sw_ring[i].mbuf);
- sw_ring[i].mbuf = NULL;
- }
+ sw_ring = rxq->rx_ring->rx_buf_ring;
+ if (sw_ring) {
+ for (i = 0;
+ i < rxq->rx_ring->rx_ring_struct->ring_size; i++) {
+ if (sw_ring[i].mbuf) {
+ rte_pktmbuf_free_seg(sw_ring[i].mbuf);
+ sw_ring[i].mbuf = NULL;
}
}
- /* Free up mbufs in Agg ring */
- sw_ring = rxq->rx_ring->ag_buf_ring;
- if (sw_ring) {
- for (i = 0;
- i < rxq->rx_ring->ag_ring_struct->ring_size; i++) {
- if (sw_ring[i].mbuf) {
- rte_pktmbuf_free_seg(sw_ring[i].mbuf);
- sw_ring[i].mbuf = NULL;
- }
+ }
+ /* Free up mbufs in Agg ring */
+ sw_ring = rxq->rx_ring->ag_buf_ring;
+ if (sw_ring) {
+ for (i = 0;
+ i < rxq->rx_ring->ag_ring_struct->ring_size; i++) {
+ if (sw_ring[i].mbuf) {
+ rte_pktmbuf_free_seg(sw_ring[i].mbuf);
+ sw_ring[i].mbuf = NULL;
}
}
+ }
- /* Free up mbufs in TPA */
- tpa_info = rxq->rx_ring->tpa_info;
- if (tpa_info) {
- int max_aggs = BNXT_TPA_MAX_AGGS(rxq->bp);
+ /* Free up mbufs in TPA */
+ tpa_info = rxq->rx_ring->tpa_info;
+ if (tpa_info) {
+ int max_aggs = BNXT_TPA_MAX_AGGS(rxq->bp);
- for (i = 0; i < max_aggs; i++) {
- if (tpa_info[i].mbuf) {
- rte_pktmbuf_free_seg(tpa_info[i].mbuf);
- tpa_info[i].mbuf = NULL;
- }
+ for (i = 0; i < max_aggs; i++) {
+ if (tpa_info[i].mbuf) {
+ rte_pktmbuf_free_seg(tpa_info[i].mbuf);
+ tpa_info[i].mbuf = NULL;
}
}
}
--
2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2019-09-01 22:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-01 22:12 [dpdk-dev] [PATCH 00/15] bnxt patchset Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 01/15] net/bnxt: fix incorrect flow steering Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 02/15] net/bnxt: fix traffic failure with higher mbuf size Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 03/15] net/bnxt: fix rxq stop/start handling Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 04/15] net/bnxt: subscribe to link speed change notification Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 05/15] net/bnxt: fix async link handling and update Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 06/15] net/bnxt: fix 40G link failure for Thor Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 07/15] net/bnxt: fix L2 context calculation " Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 08/15] net/bnxt: fix use of deferred start of transmit queues Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 09/15] net/bnxt: remove unnecessary return check Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 10/15] net/bnxt: remove unused macro Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 11/15] net/bnxt: remove unnecessary interrupt disable Ajit Khaparde
2019-09-01 22:12 ` Ajit Khaparde [this message]
2019-09-01 22:12 ` [dpdk-dev] [PATCH 13/15] net/bnxt: fix Rx queue count devop Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 14/15] net/bnxt: fix mbuf flags for PTP packets in vector mode Rx Ajit Khaparde
2019-09-01 22:12 ` [dpdk-dev] [PATCH 15/15] net/bnxt: handle reset notify async event on ns3 devices Ajit Khaparde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190901221213.92149-13-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=santosh.rastapur@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).