From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id D2181FE5 for ; Wed, 2 Nov 2016 12:38:49 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 02 Nov 2016 04:38:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,583,1473145200"; d="scan'208";a="1062809340" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.57]) ([10.237.220.57]) by fmsmga001.fm.intel.com with ESMTP; 02 Nov 2016 04:38:49 -0700 To: Mauricio Vasquez B , bruce.richardson@intel.com References: <1477972113-2600-1-git-send-email-mauricio.vasquez@polito.it> <1478030140-7127-1-git-send-email-mauricio.vasquez@polito.it> From: Ferruh Yigit Message-ID: <6c7a2a77-7370-3550-7aad-d98327f033ba@intel.com> Date: Wed, 2 Nov 2016 11:38:47 +0000 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1478030140-7127-1-git-send-email-mauricio.vasquez@polito.it> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v2] net/ring: remove unnecessary NULL check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2016 11:38:50 -0000 Hi Mauricio, On 11/1/2016 7:55 PM, Mauricio Vasquez B wrote: > 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 > --- > 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); This patch not only removes the NULL check but also changes the logic. after patch rx_queues, tx_queues and dev_private only freed if action is DEV_CREATE which is wrong. >