From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCBBFFA372A for ; Thu, 17 Oct 2019 16:03:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A101F20872 for ; Thu, 17 Oct 2019 16:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571328202; bh=zciE6zvcpsijnNLJZWP6YJk7DXC8kCO7A8ZYz/9RWhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aI8rNPMR8fJ7an7NOjEx2kAWvBOWurgyw71YYoa5y4rhlROQBraPYmRkfEQotIVp3 81Rl9V7vemd0w62az377Us5naygrG3cfKqKJrnTPifVWfdkgPuL+kfIzlKDB14vPQu GCqQV8GMqzflHexjHRUBMwIOhu8B218xXwMT/wgQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439995AbfJQQDV (ORCPT ); Thu, 17 Oct 2019 12:03:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:46738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725294AbfJQQDV (ORCPT ); Thu, 17 Oct 2019 12:03:21 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (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 4192321D7F; Thu, 17 Oct 2019 16:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571328199; bh=zciE6zvcpsijnNLJZWP6YJk7DXC8kCO7A8ZYz/9RWhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRdcnRWOVUVXl4hfcDpnawnPF6DBJYq3BvqPa0Fz9xUuRZx4Ec3G1zB+Ke800j3az GvSkFxVdzffH98FrKCTSJ+E6g91rBbP8VZFMAJM2FflwV3ncWbPLPqbWaGEV0Dm0cc 9sDxm4l6bcNjqiX8UbDD1J1UHCiNFNr1kxAEBkqg= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Yunfeng Ye , Alexander Shishkin , Alexei Starovoitov , Alexey Budankov , Andi Kleen , Daniel Borkmann , Feilong Lin , Hu Shiyuan , Igor Lubashev , Kan Liang , Mark Rutland , Martin KaFai Lau , Peter Zijlstra , Song Liu , Yonghong Song , Arnaldo Carvalho de Melo Subject: [PATCH 03/11] perf tools: Fix resource leak of closedir() on the error paths Date: Thu, 17 Oct 2019 13:02:53 -0300 Message-Id: <20191017160301.20888-4-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017160301.20888-1-acme@kernel.org> References: <20191017160301.20888-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yunfeng Ye Both build_mem_topology() and rm_rf_depth_pat() have resource leaks of closedir() on the error paths. Fix this by calling closedir() before function returns. Fixes: e2091cedd51b ("perf tools: Add MEM_TOPOLOGY feature to perf data file") Fixes: cdb6b0235f17 ("perf tools: Add pattern name checking to rm_rf") Signed-off-by: Yunfeng Ye Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Alexey Budankov Cc: Andi Kleen Cc: Daniel Borkmann Cc: Feilong Lin Cc: Hu Shiyuan Cc: Igor Lubashev Cc: Kan Liang Cc: Mark Rutland Cc: Martin KaFai Lau Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Cc: Yonghong Song Link: http://lore.kernel.org/lkml/cd5f7cd2-b80d-6add-20a1-32f4f43e0744@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 4 +++- tools/perf/util/util.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 86d9396cb131..becc2d109423 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1296,8 +1296,10 @@ static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp) continue; if (WARN_ONCE(cnt >= size, - "failed to write MEM_TOPOLOGY, way too many nodes\n")) + "failed to write MEM_TOPOLOGY, way too many nodes\n")) { + closedir(dir); return -1; + } ret = memory_node__read(&nodes[cnt++], idx); } diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 5eda6e19c947..ae56c766eda1 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -154,8 +154,10 @@ static int rm_rf_depth_pat(const char *path, int depth, const char **pat) if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) continue; - if (!match_pat(d->d_name, pat)) - return -2; + if (!match_pat(d->d_name, pat)) { + ret = -2; + break; + } scnprintf(namebuf, sizeof(namebuf), "%s/%s", path, d->d_name); -- 2.21.0