Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 25 Oct 2019 14:01:54 +0200
From:   Jiri Olsa <jolsa@redhat.com>
To:     Yunfeng Ye <yeyunfeng@huawei.com>
Cc:     peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
        mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
        namhyung@kernel.org, linux-kernel@vger.kernel.org,
        "hushiyuan@huawei.com" <hushiyuan@huawei.com>,
        "linfeilong@huawei.com" <linfeilong@huawei.com>
Subject: Re: [PATCH] perf c2c: Fix memory leak in c2c_he_zalloc()
Message-ID: <20191025120154.GA25352@krava>
References: <9d5f26f8-9429-bcb6-d491-cb789f761ea2@huawei.com>
MIME-Version: 1.0
In-Reply-To: <9d5f26f8-9429-bcb6-d491-cb789f761ea2@huawei.com>
User-Agent: Mutt/1.12.1 (2019-06-15)
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Oct 25, 2019 at 05:42:47PM +0800, Yunfeng Ye wrote:
> A memory leak in c2c_he_zalloc() is found by visual inspection.
>=20
> Fix this by adding memory free on the error paths in c2c_he_zalloc().
>=20
> Fixes: 7f834c2e84bb ("perf c2c report: Display node for cacheline address=
")
> Fixes: 1e181b92a2da ("perf c2c report: Add 'node' sort key")
> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

> ---
>  tools/perf/builtin-c2c.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>=20
> diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
> index e69f44941aad..ad7d38a9dcbe 100644
> --- a/tools/perf/builtin-c2c.c
> +++ b/tools/perf/builtin-c2c.c
> @@ -138,21 +138,29 @@ static void *c2c_he_zalloc(size_t size)
>=20
>  =09c2c_he->cpuset =3D bitmap_alloc(c2c.cpus_cnt);
>  =09if (!c2c_he->cpuset)
> -=09=09return NULL;
> +=09=09goto free_c2c_he;
>=20
>  =09c2c_he->nodeset =3D bitmap_alloc(c2c.nodes_cnt);
>  =09if (!c2c_he->nodeset)
> -=09=09return NULL;
> +=09=09goto free_cpuset;
>=20
>  =09c2c_he->node_stats =3D zalloc(c2c.nodes_cnt * sizeof(*c2c_he->node_st=
ats));
>  =09if (!c2c_he->node_stats)
> -=09=09return NULL;
> +=09=09goto free_nodeset;
>=20
>  =09init_stats(&c2c_he->cstats.lcl_hitm);
>  =09init_stats(&c2c_he->cstats.rmt_hitm);
>  =09init_stats(&c2c_he->cstats.load);
>=20
>  =09return &c2c_he->he;
> +
> +free_nodeset:
> +=09free(c2c_he->nodeset);
> +free_cpuset:
> +=09free(c2c_he->cpuset);
> +free_c2c_he:
> +=09free(c2c_he);
> +=09return NULL;
>  }
>=20
>  static void c2c_he_free(void *he)
> --=20
> 2.7.4
>=20