DPDK patches and discussions
 help / color / mirror / Atom feed
From: Mauricio Vasquez B <mauricio.vasquez@polito.it>
To: bruce.richardson@intel.com
Cc: dev@dpdk.org, ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v2] net/ring: remove unnecessary NULL check
Date: Tue,  1 Nov 2016 14:55:40 -0500	[thread overview]
Message-ID: <1478030140-7127-1-git-send-email-mauricio.vasquez@polito.it> (raw)
In-Reply-To: <1477972113-2600-1-git-send-email-mauricio.vasquez@polito.it>

Coverity detected this as an issue because internals->data will never be NULL,
then the check is not necessary.

Fixes: d082c0395bf6 ("ring: fix memory leak when detaching")
Coverity issue: 137873

Signed-off-by: Mauricio Vasquez B <mauricio.vasquez@polito.it>
---
 drivers/net/ring/rte_eth_ring.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 6d2a8c1..5ca00ed 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -599,17 +599,15 @@ rte_pmd_ring_remove(const char *name)
 
 	eth_dev_stop(eth_dev);
 
-	if (eth_dev->data) {
-		internals = eth_dev->data->dev_private;
-		if (internals->action == DEV_CREATE) {
-			/*
-			 * it is only necessary to delete the rings in rx_queues because
-			 * they are the same used in tx_queues
-			 */
-			for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-				r = eth_dev->data->rx_queues[i];
-				rte_ring_free(r->rng);
-			}
+	internals = eth_dev->data->dev_private;
+	if (internals->action == DEV_CREATE) {
+		/*
+		 * it is only necessary to delete the rings in rx_queues because
+		 * they are the same used in tx_queues
+		 */
+		for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+			r = eth_dev->data->rx_queues[i];
+			rte_ring_free(r->rng);
 		}
 
 		rte_free(eth_dev->data->rx_queues);
-- 
1.9.1

  parent reply	other threads:[~2016-11-01 19:55 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-01  3:48 [dpdk-dev] [PATCH] pmd_ring: fix coverity issue Mauricio Vasquez B
2016-11-01 14:17 ` Ferruh Yigit
2016-11-01 19:55 ` Mauricio Vasquez B [this message]
2016-11-02 11:38   ` [dpdk-dev] [PATCH v2] net/ring: remove unnecessary NULL check Ferruh Yigit
2016-11-02 12:49     ` Fulvio Risso
2016-11-02 13:15       ` Ferruh Yigit
2016-11-02 13:50         ` Mauricio Vasquez
2016-11-02 13:46   ` [dpdk-dev] [PATCH v3] " Mauricio Vasquez B
2016-11-02 14:05     ` Ferruh Yigit
2016-11-07 13:08       ` Thomas Monjalon

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=1478030140-7127-1-git-send-email-mauricio.vasquez@polito.it \
    --to=mauricio.vasquez@polito.it \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.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).