DPDK patches and discussions
 help / color / mirror / Atom feed
From: "Qiu, Michael" <michael.qiu@intel.com>
To: "Ouyang, Changchun" <changchun.ouyang@intel.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v4] af_packet: Fix some klocwork errors
Date: Mon, 9 Mar 2015 06:38:49 +0000	[thread overview]
Message-ID: <533710CFB86FA344BFBF2D6802E60286CF065F@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1425872941-26481-1-git-send-email-changchun.ouyang@intel.com>

On 3/9/2015 11:49 AM, Ouyang Changchun wrote:
> Fix possible memory leak issue: free kvlist before return;
> Fix possible resource lost issue: close qssockfd before return;
>
> Signed-off-by: Changchun Ouyang <changchun.ouyang@intel.com>
> ---
> Change in v4:
>   - Check sockfd in internals->rx_queue against 0.
>
> Change in v3:
>   - Also close sockets for all queues.
>  
> Change in v2:
>   - Make the error exit point a common path.
>
>  lib/librte_pmd_af_packet/rte_eth_af_packet.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_pmd_af_packet/rte_eth_af_packet.c b/lib/librte_pmd_af_packet/rte_eth_af_packet.c
> index 80e9bdf..acdf408 100644
> --- a/lib/librte_pmd_af_packet/rte_eth_af_packet.c
> +++ b/lib/librte_pmd_af_packet/rte_eth_af_packet.c
> @@ -691,9 +691,14 @@ error:
>  				rte_free((*internals)->rx_queue[q].rd);
>  			if ((*internals)->tx_queue[q].rd)
>  				rte_free((*internals)->tx_queue[q].rd);
> +			if (((*internals)->rx_queue[q].sockfd != 0) &&
> +				((*internals)->rx_queue[q].sockfd != qsockfd))
> +				close((*internals)->rx_queue[q].sockfd);
>  		}
>  		rte_free(*internals);
>  	}
> +	if (qsockfd != -1)

Hi, Ouyang

qsockfd was first initialized:
for (q = 0; q < nb_queues; q++) {
                /* Open an AF_PACKET socket for this queue... */
                qsockfd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));

What will happen if gets an error before here, is there any issue? I
think better to initialize it when declare it.

Thanks,
Michael
> +		close(qsockfd);
>  	return -1;
>  }
>  
> @@ -823,16 +828,21 @@ rte_pmd_af_packet_devinit(const char *name, const char *params)
>  		ret = rte_kvargs_process(kvlist, ETH_AF_PACKET_IFACE_ARG,
>  		                         &open_packet_iface, &sockfd);
>  		if (ret < 0)
> -			return -1;
> +			goto error;
>  	}
>  
>  	ret = rte_eth_from_packet(name, &sockfd, numa_node, kvlist);
>  	close(sockfd); /* no longer needed */
>  
>  	if (ret < 0)
> -		return -1;
> +		goto error;
>  
> +	rte_kvargs_free(kvlist);
>  	return 0;
> +
> +error:
> +	rte_kvargs_free(kvlist);
> +	return -1;
>  }
>  
>  static struct rte_driver pmd_af_packet_drv = {


  reply	other threads:[~2015-03-09  6:39 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-26  6:42 [dpdk-dev] [PATCH] " Ouyang Changchun
2015-02-26  8:44 ` Pawel Wodkowski
2015-02-27  0:49 ` [dpdk-dev] [PATCH v2] " Ouyang Changchun
2015-02-27 14:04   ` Neil Horman
2015-02-28  0:51     ` Ouyang, Changchun
2015-02-28  1:27   ` [dpdk-dev] [PATCH v3] " Ouyang Changchun
2015-03-09  3:49     ` [dpdk-dev] [PATCH v4] " Ouyang Changchun
2015-03-09  6:38       ` Qiu, Michael [this message]
2015-03-09  8:47         ` Ouyang, Changchun
2015-03-09  8:58       ` [dpdk-dev] [PATCH v5] " Ouyang Changchun
2015-03-09 19:25         ` John W. Linville
2015-03-10  3:29         ` [dpdk-dev] [PATCH v6] " Ouyang Changchun
2015-03-10  8:36           ` Pawel Wodkowski
2015-03-10  8:49             ` Ouyang, Changchun
2015-03-10  8:59               ` Pawel Wodkowski
2015-03-10 10:19               ` Thomas Monjalon
2015-03-11  1:18                 ` Ouyang, Changchun
2015-03-11  1:34           ` [dpdk-dev] [PATCH v7] " Ouyang Changchun
2015-03-12 10:43             ` Qiu, Michael
2015-03-12 13:38               ` Neil Horman
2015-03-12 17:09                 ` John W. Linville
2015-03-17 21:34                   ` 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=533710CFB86FA344BFBF2D6802E60286CF065F@SHSMSX101.ccr.corp.intel.com \
    --to=michael.qiu@intel.com \
    --cc=changchun.ouyang@intel.com \
    --cc=dev@dpdk.org \
    /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).