All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jayatheerthan, Jay" <jay.jayatheerthan@intel.com>
To: "Kundapura, Ganapati" <ganapati.kundapura@intel.com>,
	Weiguo Li <liwg06@foxmail.com>
Cc: "Naga Harish K, S V" <s.v.naga.harish.k@intel.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Subject: RE: [PATCH v2] eventdev/eth_rx: fix memory leak when token parsing finished
Date: Wed, 2 Feb 2022 08:25:12 +0000	[thread overview]
Message-ID: <DM6PR11MB43481F2CA7C66731D666665AFD279@DM6PR11MB4348.namprd11.prod.outlook.com> (raw)
In-Reply-To: <MW4PR11MB591118D722299B4DE362BA3F87279@MW4PR11MB5911.namprd11.prod.outlook.com>

Looks good. Thanks Weiguo for posting the patch.

Acked-by: Jay Jayatheerthan <jay.jayatheerthan@intel.com>

-Jay



> -----Original Message-----
> From: Kundapura, Ganapati <ganapati.kundapura@intel.com>
> Sent: Wednesday, February 2, 2022 1:18 PM
> To: Weiguo Li <liwg06@foxmail.com>; Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> Cc: Naga Harish K, S V <s.v.naga.harish.k@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH v2] eventdev/eth_rx: fix memory leak when token parsing finished
> 
> Acked-by: Ganapati Kundapura<ganapati.kundapura@intel.com>
> 
> > -----Original Message-----
> > From: Weiguo Li <liwg06@foxmail.com>
> > Sent: 02 February 2022 13:11
> > To: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> > Cc: Kundapura, Ganapati <ganapati.kundapura@intel.com>; Naga Harish K, S
> > V <s.v.naga.harish.k@intel.com>; dev@dpdk.org
> > Subject: [PATCH v2] eventdev/eth_rx: fix memory leak when token parsing
> > finished
> >
> > The memory get from strdup should be freed when parameter parsing
> > finished, and also should be freed when error occurs.
> >
> > Fixes: 814d01709328 ("eventdev/eth_rx: support telemetry")
> > Fixes: 9e583185318f ("eventdev/eth_rx: support telemetry")
> >
> > Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> > ---
> > v2:
> > * add memory check after strdup
> > ---
> >  lib/eventdev/rte_event_eth_rx_adapter.c | 45 ++++++++++++++++++------
> > -
> >  1 file changed, 33 insertions(+), 12 deletions(-)
> >
> > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c
> > b/lib/eventdev/rte_event_eth_rx_adapter.c
> > index ae1e260c08..8519c98b19 100644
> > --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> > @@ -3332,26 +3332,31 @@ handle_rxa_get_queue_conf(const char *cmd
> > __rte_unused,
> >
> >  	/* Get Rx adapter ID from parameter string */
> >  	l_params = strdup(params);
> > +	if (l_params == NULL)
> > +		return -ENOMEM;
> >  	token = strtok(l_params, ",");
> >  	rx_adapter_id = strtoul(token, NULL, 10);
> >
> > 	RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(rx_adapter
> > _id, -EINVAL);
> >
> >  	token = strtok(NULL, ",");
> > -	if (token == NULL || strlen(token) == 0 || !isdigit(*token))
> > +	if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
> > +		free(l_params);
> >  		return -1;
> > -
> > +	}
> >  	/* Get device ID from parameter string */
> >  	eth_dev_id = strtoul(token, NULL, 10);
> >  	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(eth_dev_id, -EINVAL);
> >
> >  	token = strtok(NULL, ",");
> > -	if (token == NULL || strlen(token) == 0 || !isdigit(*token))
> > +	if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
> > +		free(l_params);
> >  		return -1;
> > -
> > +	}
> >  	/* Get Rx queue ID from parameter string */
> >  	rx_queue_id = strtoul(token, NULL, 10);
> >  	if (rx_queue_id >= rte_eth_devices[eth_dev_id].data-
> > >nb_rx_queues) {
> >  		RTE_EDEV_LOG_ERR("Invalid rx queue_id %u",
> > rx_queue_id);
> > +		free(l_params);
> >  		return -EINVAL;
> >  	}
> >
> > @@ -3359,6 +3364,8 @@ handle_rxa_get_queue_conf(const char *cmd
> > __rte_unused,
> >  	if (token != NULL)
> >  		RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
> >  				 " telemetry command, ignoring");
> > +	/* Parsing parameter finished */
> > +	free(l_params);
> >
> >  	if (rte_event_eth_rx_adapter_queue_conf_get(rx_adapter_id,
> > eth_dev_id,
> >  						    rx_queue_id,
> > &queue_conf)) {
> > @@ -3396,26 +3403,31 @@ handle_rxa_get_queue_stats(const char *cmd
> > __rte_unused,
> >
> >  	/* Get Rx adapter ID from parameter string */
> >  	l_params = strdup(params);
> > +	if (l_params == NULL)
> > +		return -ENOMEM;
> >  	token = strtok(l_params, ",");
> >  	rx_adapter_id = strtoul(token, NULL, 10);
> >
> > 	RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(rx_adapter
> > _id, -EINVAL);
> >
> >  	token = strtok(NULL, ",");
> > -	if (token == NULL || strlen(token) == 0 || !isdigit(*token))
> > +	if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
> > +		free(l_params);
> >  		return -1;
> > -
> > +	}
> >  	/* Get device ID from parameter string */
> >  	eth_dev_id = strtoul(token, NULL, 10);
> >  	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(eth_dev_id, -EINVAL);
> >
> >  	token = strtok(NULL, ",");
> > -	if (token == NULL || strlen(token) == 0 || !isdigit(*token))
> > +	if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
> > +		free(l_params);
> >  		return -1;
> > -
> > +	}
> >  	/* Get Rx queue ID from parameter string */
> >  	rx_queue_id = strtoul(token, NULL, 10);
> >  	if (rx_queue_id >= rte_eth_devices[eth_dev_id].data-
> > >nb_rx_queues) {
> >  		RTE_EDEV_LOG_ERR("Invalid rx queue_id %u",
> > rx_queue_id);
> > +		free(l_params);
> >  		return -EINVAL;
> >  	}
> >
> > @@ -3423,6 +3435,8 @@ handle_rxa_get_queue_stats(const char *cmd
> > __rte_unused,
> >  	if (token != NULL)
> >  		RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
> >  				 " telemetry command, ignoring");
> > +	/* Parsing parameter finished */
> > +	free(l_params);
> >
> >  	if (rte_event_eth_rx_adapter_queue_stats_get(rx_adapter_id,
> > eth_dev_id,
> >  						    rx_queue_id, &q_stats)) {
> > @@ -3458,26 +3472,31 @@ handle_rxa_queue_stats_reset(const char *cmd
> > __rte_unused,
> >
> >  	/* Get Rx adapter ID from parameter string */
> >  	l_params = strdup(params);
> > +	if (l_params == NULL)
> > +		return -ENOMEM;
> >  	token = strtok(l_params, ",");
> >  	rx_adapter_id = strtoul(token, NULL, 10);
> >
> > 	RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(rx_adapter
> > _id, -EINVAL);
> >
> >  	token = strtok(NULL, ",");
> > -	if (token == NULL || strlen(token) == 0 || !isdigit(*token))
> > +	if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
> > +		free(l_params);
> >  		return -1;
> > -
> > +	}
> >  	/* Get device ID from parameter string */
> >  	eth_dev_id = strtoul(token, NULL, 10);
> >  	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(eth_dev_id, -EINVAL);
> >
> >  	token = strtok(NULL, ",");
> > -	if (token == NULL || strlen(token) == 0 || !isdigit(*token))
> > +	if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
> > +		free(l_params);
> >  		return -1;
> > -
> > +	}
> >  	/* Get Rx queue ID from parameter string */
> >  	rx_queue_id = strtoul(token, NULL, 10);
> >  	if (rx_queue_id >= rte_eth_devices[eth_dev_id].data-
> > >nb_rx_queues) {
> >  		RTE_EDEV_LOG_ERR("Invalid rx queue_id %u",
> > rx_queue_id);
> > +		free(l_params);
> >  		return -EINVAL;
> >  	}
> >
> > @@ -3485,6 +3504,8 @@ handle_rxa_queue_stats_reset(const char *cmd
> > __rte_unused,
> >  	if (token != NULL)
> >  		RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
> >  				 " telemetry command, ignoring");
> > +	/* Parsing parameter finished */
> > +	free(l_params);
> >
> >  	if (rte_event_eth_rx_adapter_queue_stats_reset(rx_adapter_id,
> >  						       eth_dev_id,
> > --
> > 2.25.1


  reply	other threads:[~2022-02-02  8:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-02  7:13 [PATCH] eventdev/eth_rx: fix memory leak when token parsing finished Weiguo Li
2022-02-02  7:40 ` [PATCH v2] " Weiguo Li
2022-02-02  7:48   ` Kundapura, Ganapati
2022-02-02  8:25     ` Jayatheerthan, Jay [this message]
2022-02-02 14:54     ` Kundapura, Ganapati
2022-02-02 16:47       ` Kundapura, Ganapati
2022-02-03  3:38   ` Weiguo Li
2022-02-03  5:44     ` Kundapura, Ganapati
2022-02-03  8:49   ` [PATCH v4] " Weiguo Li
2022-02-03 13:09     ` Kundapura, Ganapati
2022-02-04  6:54     ` Jayatheerthan, Jay
2022-02-04  7:49     ` [PATCH v5] " Weiguo Li
2022-02-04  7:57       ` Jayatheerthan, Jay
2022-02-04  8:21     ` [PATCH v6] " Weiguo Li
2022-02-04  9:47       ` Jayatheerthan, Jay
2022-02-18  9:39         ` Jerin Jacob
2022-02-22 10:08           ` Kevin Traynor
2022-02-23  7:21             ` Naga Harish K, S V
2022-02-03  6:02 ` [PATCH] " Stephen Hemminger
2022-02-03  7:18 ` [PATCH v3] " Weiguo Li

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=DM6PR11MB43481F2CA7C66731D666665AFD279@DM6PR11MB4348.namprd11.prod.outlook.com \
    --to=jay.jayatheerthan@intel.com \
    --cc=dev@dpdk.org \
    --cc=ganapati.kundapura@intel.com \
    --cc=liwg06@foxmail.com \
    --cc=s.v.naga.harish.k@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.