From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33A2E19644F; Thu, 6 Jun 2024 14:09:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682971; cv=none; b=kz4ha+eE/PSjTj1+y/hFrktHshSTcZs1C0x7VTD2HmD78/Hilhm0o8uYSU2NGWA2ktQFZ/DhI2z2ORU2IQOUqoeckvmaKAXTns2yGT5hFMz0CHLnTPOsnLh5Axvo0Cy+8PEIvSYa9KYj/9ofJVlqyFB+Z1mZ9kE6BVHOQ+PMb2U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682971; c=relaxed/simple; bh=wYvIbb2BLPGr+h26wN83ld/DtcpE1Tdd9F7DyqC7ELo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ezXp56M1+qMf+ITFWWY/wL7SeGTILo4AceOzdBuQkWBeTHIhdJKtE71ldiZKzvRQjl1C9JM6pkJhM6XSufo2GXdQV7C/AD6Bxf9tiR/XwK4+s+eVZCNQBJiFEw59TXeA4Cxc66GhmONGOnd6uV7hEygv8hohADvIDQPLP3lv8+o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IdHnYG1L; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IdHnYG1L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3BB1C2BD10; Thu, 6 Jun 2024 14:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682971; bh=wYvIbb2BLPGr+h26wN83ld/DtcpE1Tdd9F7DyqC7ELo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IdHnYG1LRwGoE02XwI9zCbI+0I+X2AEDOfo1zr5ZLsH5YpGhkbaWWeQ1YwWj6Wbf7 3mzgbGLDcqq0iEFP6hn6ADMOxPLC5qtZVXkPX5+GiQ0egBoAc8Ls3eWxzY9UzaDpeb tQavzahn3GT5wMBQ0VMmz0xLlSLmt7U7wHSLqa7Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Adrian Hunter , Alexander Shishkin , Andi Kleen , Athira Rajeev , Ben Gainey , Ingo Molnar , James Clark , Jiri Olsa , Kajol Jain , Kan Liang , K Prateek Nayak , Li Dong , Mark Rutland , Namhyung Kim , Oliver Upton , Paran Lee , Peter Zijlstra , Ravi Bangoria , Sun Haiyong , Tim Chen , Yanteng Si , Yicong Yang , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.9 093/374] perf annotate: Fix memory leak in annotated_source Date: Thu, 6 Jun 2024 16:01:12 +0200 Message-ID: <20240606131655.008469034@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit a3f7768bcf48281df14d98715f076c5656571527 ] Freeing hash map doesn't free the entries added to the hashmap, add the missing free(). Fixes: d3e7cad6f36d9e80 ("perf annotate: Add a hashmap for symbol histogram") Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Athira Rajeev Cc: Ben Gainey Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Kajol Jain Cc: Kan Liang Cc: K Prateek Nayak Cc: Li Dong Cc: Mark Rutland Cc: Namhyung Kim Cc: Oliver Upton Cc: Paran Lee Cc: Peter Zijlstra Cc: Ravi Bangoria Cc: Sun Haiyong Cc: Tim Chen Cc: Yanteng Si Cc: Yicong Yang Link: https://lore.kernel.org/r/20240507183545.1236093-3-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/annotate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 2ebe2fe92a10b..617b98da377e5 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -887,9 +887,15 @@ static struct annotated_source *annotated_source__new(void) static __maybe_unused void annotated_source__delete(struct annotated_source *src) { + struct hashmap_entry *cur; + size_t bkt; + if (src == NULL) return; + hashmap__for_each_entry(src->samples, cur, bkt) + zfree(&cur->pvalue); + hashmap__free(src->samples); zfree(&src->histograms); free(src); -- 2.43.0