Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1456933ybk; Thu, 21 May 2020 07:20:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHEIqw8MPo8SEet/sxZqrfUSrteuSUP2Y61ki7gZqW1WLL9Zu+JqddxRJVhjlCujUwu2vB X-Received: by 2002:a17:907:b11:: with SMTP id h17mr3793482ejl.430.1590070826623; Thu, 21 May 2020 07:20:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590070826; cv=none; d=google.com; s=arc-20160816; b=QwvW+BDyaDbjGuOuxtbwKOesz+OxTBJp5bLE5cxWj5s8xWA94pmkenJsZMpqrepAfV CMMP1RQFfi9EalJ/LSPIZN2gFwmucebp88YVyHDCKe2FVE6VHMFrUvz6CqeWiIMs2kj0 QVS6cjBNRNxQWbzJHGErKYjVfIKLpCPrKj5OQHCfO0BKJc/VftQyRZwvZIQ9nCOQxtHK UCZX31eetv/Pjlzopsarrt8topRbKC4fR5iLpU4S/nII3SUnNFo1Lw7cFQG72qolHY5c IQFsHA6TEO03o/0NfSngBL1lxwGBWhGsZZ6BU5YGR5zWkxiAcSD9lwJdvXNIK94wSF4Z lqyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=HyRMM1vnSf1xg8+zPYEIB0XK6RfuT3mR55QDRLGT+NU=; b=tcpehfY8NE+BfDb99ZMn9HTHAei+ZA6RRtMcnv1RtpvfBq3Xb+9YNX2OtZibQWCHa1 ZlHlsoDuXH3haSocbABFv8LRLbmXLdKLZMBKpjbqjpN1C9xZy8civgMX3hTx6qPBboOy 3f3daqbgUa7KcMLr178mj7CnEbVXaD3gnOS/5dzVUrPRWe985zTIXGNRYgITujCht9iv VnsYpNYrh6QAnOAA/DX1IMdNI9v+WSVM2HWGhSZIg8b1kpCEMNdOFwT5K4Q3K1sozawV 4/pOoggQgTtpmPvGb6/8USN5Ld4BN/xhIbjp+2xdGIcVsbCjMeT8DXXXxA1wsJyXxwPp TCbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aSM1tGEN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p1si3250997ejd.333.2020.05.21.07.20.03; Thu, 21 May 2020 07:20:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aSM1tGEN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727937AbgEUOPs (ORCPT + 99 others); Thu, 21 May 2020 10:15:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:34762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726903AbgEUOPs (ORCPT ); Thu, 21 May 2020 10:15:48 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8DBE220721; Thu, 21 May 2020 14:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590070547; bh=I+ppeGpRJmwBqRsyqpZd6h5unEhCpnis2mJI09ZkU7Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aSM1tGENz5jfJftUm03PtVI9V3CCBxNJlwh+F8YeZYHb0WHhLJXzkezQF0EXWKQ4v NpX68Xtbp0lnsIX0CgsCHnVqU217Wz9zyiZ8BFInusHs5ih5pUHIE1HByV3gAxPFFz 0V7A2QR8VbdFtY/JivIrvJlgdqcPe6hnhb9u+JZo= Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 738EE40AFD; Thu, 21 May 2020 11:15:45 -0300 (-03) Date: Thu, 21 May 2020 11:15:45 -0300 From: Arnaldo Carvalho de Melo To: Wei Li Cc: Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , linux-kernel@vger.kernel.org, Li Bin , Xie XiuQi , Hongbo Yao Subject: Re: [PATCH 2/4] perf svghelper: Fix memory leak in svg_build_topology_map Message-ID: <20200521141545.GC3898@kernel.org> References: <20200521133218.30150-1-liwei391@huawei.com> <20200521133218.30150-3-liwei391@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200521133218.30150-3-liwei391@huawei.com> X-Url: http://acmel.wordpress.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, May 21, 2020 at 09:32:16PM +0800, Wei Li escreveu: > From: Li Bin > > Fix leak of memory pointed to by t.sib_thr and t.sib_core in > svg_build_topology_map. > > Signed-off-by: Li Bin > --- > tools/perf/util/svghelper.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c > index 96f941e01681..e2b3b0e2fafe 100644 > --- a/tools/perf/util/svghelper.c > +++ b/tools/perf/util/svghelper.c > @@ -754,6 +754,7 @@ int svg_build_topology_map(struct perf_env *env) > int i, nr_cpus; > struct topology t; > char *sib_core, *sib_thr; > + int ret; Please set ret to -1 here int ret = -1; So that you don't have to add all those lines below... > > nr_cpus = min(env->nr_cpus_online, MAX_NR_CPUS); > > @@ -767,12 +768,14 @@ int svg_build_topology_map(struct perf_env *env) > > if (!t.sib_core || !t.sib_thr) { > fprintf(stderr, "topology: no memory\n"); > + ret = -1; > goto exit; > } > > for (i = 0; i < env->nr_sibling_cores; i++) { > if (str_to_bitmap(sib_core, &t.sib_core[i], nr_cpus)) { > fprintf(stderr, "topology: can't parse siblings map\n"); > + ret = -1; > goto exit; > } > > @@ -782,6 +785,7 @@ int svg_build_topology_map(struct perf_env *env) > for (i = 0; i < env->nr_sibling_threads; i++) { > if (str_to_bitmap(sib_thr, &t.sib_thr[i], nr_cpus)) { > fprintf(stderr, "topology: can't parse siblings map\n"); > + ret = -1; > goto exit; > } > > @@ -791,6 +795,7 @@ int svg_build_topology_map(struct perf_env *env) > topology_map = malloc(sizeof(int) * nr_cpus); > if (!topology_map) { > fprintf(stderr, "topology: no memory\n"); > + ret = -1; > goto exit; > } > > @@ -798,12 +803,11 @@ int svg_build_topology_map(struct perf_env *env) > topology_map[i] = -1; > > scan_core_topology(topology_map, &t, nr_cpus); > - > - return 0; ... as you'll set it to zero here :-) > + ret = 0; > > exit: > zfree(&t.sib_core); > zfree(&t.sib_thr); > > - return -1; > + return ret; > } > -- > 2.17.1 > -- - Arnaldo