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;
From:   Hewenliang <hewenliang4@huawei.com>
To:     <peterz@infradead.org>, <jolsa@redhat.com>, <acme@kernel.org>,
        <mark.rutland@arm.com>, <alexander.shishkin@linux.intel.com>,
        <namhyung@kernel.org>, <ilubashe@akamai.com>, <ak@linux.intel.com>,
        <linux-kernel@vger.kernel.org>, <hewenliang4@huawei.com>
CC:     <hushiyuan@huawei.com>, <linfeilong@huawei.com>
Subject: [PATCH] perf tools: Call closedir to release the resource before we return
Date:   Thu, 24 Oct 2019 23:16:05 -0400
Message-ID: <20191025031605.23658-1-hewenliang4@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type:   text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

We should close the directory on pattern failure before the return
of rm_rf_depth_pat.

Fixes: cdb6b0235f170 ("perf tools: Add pattern name checking to rm_rf")
Signed-off-by: Hewenliang <hewenliang4@huawei.com>
---
 tools/perf/util/util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 5eda6e19c947..1aadca8c43f3 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))
+		if (!match_pat(d->d_name, pat)) {
+			closedir(dir);
 			return -2;
+		}
 
 		scnprintf(namebuf, sizeof(namebuf), "%s/%s",
 			  path, d->d_name);
-- 
2.19.1