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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT 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 60C94C43381 for ; Thu, 21 Feb 2019 12:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 352B520880 for ; Thu, 21 Feb 2019 12:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727800AbfBUMjM (ORCPT ); Thu, 21 Feb 2019 07:39:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57028 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbfBUMjM (ORCPT ); Thu, 21 Feb 2019 07:39:12 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D15706696F; Thu, 21 Feb 2019 12:39:11 +0000 (UTC) Received: from krava (unknown [10.43.17.20]) by smtp.corp.redhat.com (Postfix) with SMTP id 1859A60BE6; Thu, 21 Feb 2019 12:39:09 +0000 (UTC) Date: Thu, 21 Feb 2019 13:39:09 +0100 From: Jiri Olsa To: Jonas Rabenstein Cc: linux-perf-users@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Namhyung Kim , linux-kernel@vger.kernel.org Subject: Re: [PATCH] perf hist: fix memory leak if histogram entry is reused Message-ID: <20190221123909.GG10990@krava> References: <20190221122306.1511-1-jonas.rabenstein@studium.uni-erlangen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190221122306.1511-1-jonas.rabenstein@studium.uni-erlangen.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 21 Feb 2019 12:39:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 21, 2019 at 01:23:06PM +0100, Jonas Rabenstein wrote: > In __hists__add_entry the srcline of the addr_location is duplicated > for the hist_entry. If hists__findnew_entry returns an already existing > hist_entry the srcline has to be freed again as no further reference to > that duplicated srcline would exists anymore. > > Signed-off-by: Jonas Rabenstein > --- > tools/perf/util/hist.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c > index 8aad8330e392..25b8dbdbbe87 100644 > --- a/tools/perf/util/hist.c > +++ b/tools/perf/util/hist.c > @@ -623,6 +623,9 @@ __hists__add_entry(struct hists *hists, > .ops = ops, > }, *he = hists__findnew_entry(hists, &entry, al, sample_self); > > + if (he && he->srcline != entry.srcline) > + free(entry.srcline); > + > if (!hists->has_callchains && he && he->callchain_size != 0) > hists->has_callchains = true; > return he; nice, do we have similar issue in here? jirka --- diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 216388003dea..e65e6822c848 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -966,7 +966,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, .map = al->map, .sym = al->sym, }, - .srcline = al->srcline ? strdup(al->srcline) : NULL, + .srcline = al->srcline, .parent = iter->parent, .raw_data = sample->raw_data, .raw_size = sample->raw_size,