DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: Gaurav Singh <gaurav1086@gmail.com>,
	"Power, Ciara" <ciara.power@intel.com>
Cc: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>,
	"dev@dpdk.org" <dev@dpdk.org>, nd <nd@arm.com>
Subject: Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
Date: Fri, 30 Oct 2020 15:59:02 +0100
Message-ID: <CAJFAV8xTA4-c2oePmybfjOMwYDSy2jUZkUabW4w0+Fk3auxN5w@mail.gmail.com> (raw)
In-Reply-To: <DM6PR11MB2555567CC31B0EEB1DF3A99BE63B0@DM6PR11MB2555.namprd11.prod.outlook.com>

Hello Gaurav,

On Tue, Sep 22, 2020 at 12:27 PM Power, Ciara <ciara.power@intel.com> wrote:
> >-----Original Message-----
> >From: dev <dev-bounces@dpdk.org> On Behalf Of Honnappa Nagarahalli
> >Sent: Tuesday 11 August 2020 22:01
> >To: Gaurav Singh <gaurav1086@gmail.com>; dev@dpdk.org
> >Cc: nd <nd@arm.com>; Honnappa Nagarahalli
> ><Honnappa.Nagarahalli@arm.com>; nd <nd@arm.com>
> >Subject: Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
> >
> ><snip>
> >
> >>
> >> fix memory leak
> >>
> >> Fixes: c5b7197f66 ("telemetry: move some functions to metrics
> >> library")
> >>
> >> Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
> >> ---
> >>  lib/librte_metrics/rte_metrics_telemetry.c | 21 ++++++++++++++++-----
> >>  1 file changed, 16 insertions(+), 5 deletions(-)
>
>
> I think this commit message should be more descriptive, and is missing Cc: stable@dpdk.org
>
>
> >> diff --git a/lib/librte_metrics/rte_metrics_telemetry.c
> >> b/lib/librte_metrics/rte_metrics_telemetry.c
> >> index 289ebae0b..7b6d1063c 100644
> >> --- a/lib/librte_metrics/rte_metrics_telemetry.c
> >> +++ b/lib/librte_metrics/rte_metrics_telemetry.c
> >> @@ -41,12 +41,17 @@
> >> rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t
> >> port_id)
> >>      }
> >>
> >>      xstats_names = malloc(sizeof(*xstats_names) * num_xstats);
> >> +    if (xstats_names == NULL) {
> >> +            METRICS_LOG_ERR("Failed to malloc memory for
> >> xstats_names");
> >> +            return -ENOMEM;
> >> +    }
> >> +
> >>      eth_xstats_names = malloc(sizeof(struct rte_eth_xstat_name)
> >>                      * num_xstats);
> >> -    if (eth_xstats_names == NULL || xstats_names == NULL) {
> >> -            METRICS_LOG_ERR("Failed to malloc memory for
> >> xstats_names");
> >> -            ret = -ENOMEM;
> >> -            goto free_xstats;
> >> +    if (eth_xstats_names == NULL) {
> >> +            METRICS_LOG_ERR("Failed to malloc memory for
> >> eth_xstats_names");
> >> +            free(xstats_names);
> >> +            return -ENOMEM;
> >>      }
>
> Is there a reason for the above changes? I think they are unrelated to
> the memory leak this patch is fixing.
>
> >>      if (rte_eth_xstats_get_names(port_id,
> >> @@ -167,9 +172,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t
> >> *ports,
> >>      }
> >>
> >>      metrics = malloc(sizeof(struct rte_metric_value) * num_metrics);
> >> +    if (metrics == NULL) {
> >> +            METRICS_LOG_ERR("Cannot allocate memory");
> >> +            return -ENOMEM;
> >> +    }
> >> +
> >>      names = malloc(sizeof(struct rte_metric_name) * num_metrics);
> >> -    if (metrics == NULL || names == NULL) {
> >> +    if (names == NULL) {
> >>              METRICS_LOG_ERR("Cannot allocate memory");
> >> +            free(metrics);
> >>              return -ENOMEM;
> >>      }
>
> This does fix the resource leak, but I do think it can be done in a
> simpler way, as shown in the patch I sent to fix the logged coverity issue
> for this: https://patchwork.dpdk.org/patch/78052/
> I will remove my patch seeing as this patch is fixing the same thing.

I agree with Ciara.
Could you respin?

Thanks.


-- 
David Marchand


  reply	other threads:[~2020-10-30 14:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31  3:45 [dpdk-dev] [PATCH] librte_metrics: " Gaurav Singh
2020-07-31  4:54 ` Honnappa Nagarahalli
2020-08-01  1:46 ` Gaurav Singh
2020-08-01  6:08 ` Gaurav Singh
2020-08-01 23:34   ` Honnappa Nagarahalli
2020-08-08 16:39 ` [dpdk-dev] [PATCH] lib/metrics: " Gaurav Singh
2020-08-11 21:01   ` Honnappa Nagarahalli
2020-09-22 10:26     ` Power, Ciara
2020-10-30 14:59       ` David Marchand [this message]
2020-11-03 21:36         ` David Marchand

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=CAJFAV8xTA4-c2oePmybfjOMwYDSy2jUZkUabW4w0+Fk3auxN5w@mail.gmail.com \
    --to=david.marchand@redhat.com \
    --cc=Honnappa.Nagarahalli@arm.com \
    --cc=ciara.power@intel.com \
    --cc=dev@dpdk.org \
    --cc=gaurav1086@gmail.com \
    --cc=nd@arm.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

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git