Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CD2CBA41 for ; Tue, 24 Sep 2024 00:37:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138253; cv=none; b=oWCUtU4vWJAaGU9ELT5Cv1vJaitISHHILjR9yySt6LDsZ9IlaKu295Wa3UCEDNRxOGCnP0xd2Wj3z0OfyI0s9pB/Ih5uAhyZsQ4AGvNjFP7Y/oZ513Ly2XLUXaHvWEODO48OGpBnXUO/gNBhOJhV+uwg88arvbm6hJLroDoLjVI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138253; c=relaxed/simple; bh=Qo1Qps6/oRTPke3sLUp94xRSSuy8lIc7nno8/awTXfI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=BC0j9/Q5kuCzjcPsO+lDznuBdRunKSoVn4XPllngHjGg3vmvd7cST+QBAb42aRQE2cd8qEU6jdTdIXF8Pj9r/E808DwCCKVJybXzmI0liCu+0FJ1jN1Jb/rj2kKvP1qcXtd9WEhLvpVqUuewhZNnXrlUacAxgCGYDn4ruJM2eyg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=UlE81wgz; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UlE81wgz" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e225c289c90so5648959276.3 for ; Mon, 23 Sep 2024 17:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727138251; x=1727743051; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=T/x8P3+kVeCiLfvUzo1Nwxxj4w2s36O0oobO+3bH8RI=; b=UlE81wgz363HFPR2YEmwLxjoEsHOCGEdAwTakQeW6SRURnM6WmDuE9v9kRdLShBo/g JrWXhVndNWqvjeEDQ1jReP0W9nxNBqwtnP2Vuf417yNp3fbjhBIhEjPZUdOw/nC5s/pL f/Ww7VuxWUgQoov/lzYaGZOlIIsT0MZz1pPkiwnnE4KrBo1g32PARgLBi/DSe/dh6waW RIRHuQZ/d3NYJAKsWdc8RMaVw2FY23W5MpYL4BnzTcKFaD+4Wb9voDM+Sr9FbPIwW4b6 uWnJuf4YkaGNRENu40ZFoqFSJew85kFztZll25Gm6933NsIS1h9W1MPar5rdVzTigexb vuzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727138251; x=1727743051; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=T/x8P3+kVeCiLfvUzo1Nwxxj4w2s36O0oobO+3bH8RI=; b=VZ15M6jMVeT/SQcHmdFGK3zBcDqihJEdDiQcIgcpbAmtAKKvCJJiK0EtYCh/4C7385 QvF010xCZXxb0PiywqCyr6B/24Hv87bzVWZnU2oIE5sDrjpDrEXmoheEbTXE8EJZkcMw 4wtYJNG8fYq2alYBjUUOcitmuKKOHButsXaCgOZSoUhvxd8JoCq1NxT8Xm7q2+hapgxN y2OK0iPixgi8PpoWzXnlRlL0YTtabJGkTHwvhhqTIyFILwDjbjVgaTwr1y8SQmVUbxbe 8chw8JXw7TRUjsV8k90GZfULlGDaP5zpE5riqNvicvpSPY3KczoMZ+1YlD5ogJj/pxRb Y0qw== X-Forwarded-Encrypted: i=1; AJvYcCUiIHVX0MTaBn68mZlK5DX6sfnMcwq5CoKxNDOhMGbcspeVmL4GvHx3PAlnwk4JcK0/I8cDHKSMAe0md+iaKtxV@vger.kernel.org X-Gm-Message-State: AOJu0YzwwllRMSbq6kD90bFp1x2jr3XMe2sPHcNnuWjobWnm16L5YABc yC2ehsrCchDgBcG7eRx7cJHS44X8qbCxgcZfa9da2W9/nCuwk9i6rJXonN6uMqOOOHWBj0TEWbW WRz8Jvw== X-Google-Smtp-Source: AGHT+IH/rgjYbdOMDt4KrSS3kKCFiGWPaYMRdvdlvzOkH+OY0cQ7tzxBAPYC6JadwO1FlEe3HgelNh9m6Ab7 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:61a6:b27c:a1cd:e6a0]) (user=irogers job=sendgmr) by 2002:a25:83cd:0:b0:e1a:7693:a8ac with SMTP id 3f1490d57ef6-e2252fb2d4dmr33250276.8.1727138251223; Mon, 23 Sep 2024 17:37:31 -0700 (PDT) Date: Mon, 23 Sep 2024 17:37:19 -0700 In-Reply-To: <20240924003720.617258-1-irogers@google.com> Message-Id: <20240924003720.617258-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240924003720.617258-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Subject: [PATCH v1 2/3] perf probe: Fix libdw memory leak From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Kajol Jain , Athira Rajeev , "Steinar H. Gunderson" , Masami Hiramatsu , "David S. Miller" , Przemek Kitszel , Alexander Lobakin , Hemant Kumar , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Jihong , leo.yan@arm.com Content-Type: text/plain; charset="UTF-8" Add missing dwarf_cfi_end to free memory associated with probe_finder cfi_eh or cfi_dbg. This addresses leak sanitizer issues seen in: tools/perf/tests/shell/test_uprobe_from_different_cu.sh Fixes: 270bde1e76f4 ("perf probe: Search both .eh_frame and .debug_frame sections for probe location") Signed-off-by: Ian Rogers --- tools/perf/util/probe-finder.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 630e16c54ed5..78f34fa0c391 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -1379,6 +1379,11 @@ int debuginfo__find_trace_events(struct debuginfo *dbg, if (ret >= 0 && tf.pf.skip_empty_arg) ret = fill_empty_trace_arg(pev, tf.tevs, tf.ntevs); +#if _ELFUTILS_PREREQ(0, 142) + dwarf_cfi_end(tf.pf.cfi_eh); + dwarf_cfi_end(tf.pf.cfi_dbg); +#endif + if (ret < 0 || tf.ntevs == 0) { for (i = 0; i < tf.ntevs; i++) clear_probe_trace_event(&tf.tevs[i]); -- 2.46.0.792.g87dc391469-goog