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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 1395DC433DF for ; Wed, 29 Jul 2020 09:19:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCF3820838 for ; Wed, 29 Jul 2020 09:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596014368; bh=0hfC4riIbbfjyYx5ZFA9y19DUbcarADpjn7K4IQqJzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hU9QLG3Owjms8JC1jkbpVuaxZ/GL93Zwl7Y47mG8AHVZVh4FGFmgS9pjZqwj992Gr BXCJpqFsIsbQukgv8UBVl7H03dvtfPkEd1pJ6wU/muPq1oLNqVB99Dh7SgozJ8J3gA QI/8Wg59BjNjksMmA6upyZR5oPsqJOWaHnzXtOyo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728175AbgG2JT1 convert rfc822-to-8bit (ORCPT ); Wed, 29 Jul 2020 05:19:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38212 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727849AbgG2JT0 (ORCPT ); Wed, 29 Jul 2020 05:19:26 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355-_i_0zQmKPDGK0A3VtAeeLg-1; Wed, 29 Jul 2020 05:19:19 -0400 X-MC-Unique: _i_0zQmKPDGK0A3VtAeeLg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BEEF59; Wed, 29 Jul 2020 09:19:17 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.193.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E47D6931E; Wed, 29 Jul 2020 09:19:13 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo , Ian Rogers , Alexander Shishkin , Andi Kleen , John Garry , Kajol Jain , Michael Petlan , Namhyung Kim , Paul Clarke , Peter Zijlstra , Stephane Eranian , lkml , Ingo Molnar , Peter Zijlstra Subject: [PATCH 01/19] perf metric: Fix memory leak in expr__add_id function Date: Wed, 29 Jul 2020 11:18:50 +0200 Message-Id: <20200729091908.1378911-2-jolsa@kernel.org> In-Reply-To: <20200729091908.1378911-1-jolsa@kernel.org> References: <20200729091908.1378911-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Arnaldo found that we don't release value data in case the hashmap__set fails. Releasing it in case of an error. Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Jiri Olsa Acked-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: John Garry Cc: Kajol Jain Cc: Michael Petlan Cc: Namhyung Kim Cc: Paul Clarke Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20200719181320.785305-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/expr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 5d05f9765ed8..578a173d4873 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -47,6 +47,8 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val) } ret = hashmap__set(&ctx->ids, id, data_ptr, (const void **)&old_key, (void **)&old_data); + if (ret) + free(data_ptr); free(old_key); free(old_data); return ret; -- 2.25.4