From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 25076328B6A for ; Sat, 17 Jan 2026 05:29:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627771; cv=none; b=Iaqp4JwLTD/5ajsOmJjS4eqd/uGd4we2HncT7namLs0EQhjelQaYPjsMcCjF183VjCHY9Cda7tRQjBGXELWDR6EmGTHF3/+UGq7d+2Md9AsgMUHgZOCoV7wVgWUtHFrjipbXG3TGWEFC8mdqbvUK7ITFRtXDIzZyup5Of3Bymzs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627771; c=relaxed/simple; bh=jfaOMIZp5WWV/XUuIQcu/j8yYwwDPuLLQ0zeJYIZN0I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=kqtVhuO/7ynvKp+c9gt1FGbiUB1AqFpjEbYIsdW+L6A84GWYX6rcsS5JrCBOJAEIK4K6m+CjQKfMB7127Lp6essIXre63TszC+gvosNdLJx6xdzr3xYtU83hihrK4LuHZgIuGwdYOXe5btRuTfqRpGpQeT0k4eWYegflrctlayw= 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=XbtQeZAD; arc=none smtp.client-ip=74.125.82.73 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="XbtQeZAD" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-12337114f3fso4529044c88.0 for ; Fri, 16 Jan 2026 21:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768627768; x=1769232568; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=QanJEL0okHblW7w6/vRkxVN/qYTBTTJdOuW3T6wN39U=; b=XbtQeZADhCi34N0wzrefecAMIgbsb8S6mmfSHX/UVUbE+MIakB5VpylKyXzE/yx4Kp F4WKv9bjIqgGnjq1iIB8D5U2pkL4yRIxYbgHU6/EBIPWxcLDKqnmBjANwVNgV83QKP4E 1Ym2j0QP2nrgDaVy6xhW7VIQ1E6PxGBQv8ypYOWIKyXuwNerZxQ49hZ92Vn0w3dqxORS PDH5R9Otflr2FmK99GcxDtik9UL154/+Gsx3dE6B8TseMwksCNKcmEwNtrt7dzpxKsaW zqHapetdZpEznHQMWyA/OdFxK+YvOyO8p+4J8FM9H5y4Q+xP3rT5gSYnt6Z8s2wc8tGJ YHBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768627768; x=1769232568; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QanJEL0okHblW7w6/vRkxVN/qYTBTTJdOuW3T6wN39U=; b=MHCZ7R7kXSUr4KTXpINqLRfW1Bw/kTHOeuxae9jgeXOnrVq2wpR7+dclu1qha97OCe RQHqOTqzeWxxFN7BsSwrSUMuLI5CI7EnZiAgGlTkkBf+T0XO5MLF1uMFh4n9/Cnd3Bsq CDxVpG48c7nRUyBY8OjYvyuPbE5rBrHCNkFbg1RHHLP3WX0Eh/yuhkbTkJ1H0Gqv6u2C 09DoTPeOwUXri6NaqFcm0TPIs3LNCGi1q3TyjwplkNJDRUuOZfKySMUxDoaPB8FyPdIA Icgk+dE980SJQwRZjUN2I8Onvyp8X6t/v2oWjD/D0MXK68NbZQvHCTCR+3Ty8UODAOJ1 c+Kg== X-Forwarded-Encrypted: i=1; AJvYcCXR+unhWxf8c+Czc9uNwzSVwLqqOcXT917VA/YXIp//8pREvL7/7GrIkPSS3DfiiuW49fRNVSZjPqqg@vger.kernel.org X-Gm-Message-State: AOJu0YxL+cESlts9Pr2plm37/g+BpOU4ejcjixcAxv4aDotZI7Pd1Yrl pRyWfZDZyKKZA4F5dPfHCgoupzlqxe8Lg2Dal3WkIXmhXnk0yJTcYRl2+OLRYEivPlU/Skr4YuB IJcQVv5BVrg== X-Received: from dlbcq13.prod.google.com ([2002:a05:7022:248d:b0:11d:cf4c:62ab]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2487:b0:119:e56c:18a8 with SMTP id a92af1059eb24-1244a7257e1mr4331178c88.16.1768627767987; Fri, 16 Jan 2026 21:29:27 -0800 (PST) Date: Fri, 16 Jan 2026 21:28:31 -0800 In-Reply-To: <20260117052849.2205545-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-csky@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260117052849.2205545-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260117052849.2205545-6-irogers@google.com> Subject: [PATCH v1 05/23] perf libdw_addr2line: Fixes to srcline memory allocation From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , John Garry , Will Deacon , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Shimin Guo , Athira Rajeev , Stephen Brennan , Howard Chu , Thomas Falcon , Andi Kleen , "Dr. David Alan Gilbert" , Dmitry Vyukov , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Chun-Tse Shao , Aditya Bodkhe , Haibo Xu , Sergei Trofimovich , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Wielaard Content-Type: text/plain; charset="UTF-8" Some irregular stack traces are causing double frees and memory leaks. Make the code robust by proactively freeing and being more careful with the memory management of the leaf_srcline. Fixes: 88c51002d06f ("perf addr2line: Add a libdw implementation") Signed-off-by: Ian Rogers --- tools/perf/util/libdw.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/libdw.c b/tools/perf/util/libdw.c index e4bfd52bd172..b96c4e0d728f 100644 --- a/tools/perf/util/libdw.c +++ b/tools/perf/util/libdw.c @@ -42,16 +42,24 @@ static int libdw_a2l_cb(Dwarf_Die *die, void *_args) call_srcline = srcline_from_fileline(call_fname, die_get_call_lineno(die)); list_for_each_entry(ilist, &args->node->val, list) { + if (args->leaf_srcline == ilist->srcline) + args->leaf_srcline_used = false; + else if (ilist->srcline != srcline__unknown) + free(ilist->srcline); ilist->srcline = call_srcline; call_srcline = NULL; break; } - if (call_srcline && call_fname) + if (call_srcline && call_srcline != srcline__unknown) free(call_srcline); /* Add this symbol to the chain as the leaf. */ - inline_list__append_tail(inline_sym, args->leaf_srcline, args->node); - args->leaf_srcline_used = true; + if (!args->leaf_srcline_used) { + inline_list__append_tail(inline_sym, args->leaf_srcline, args->node); + args->leaf_srcline_used = true; + } else { + inline_list__append_tail(inline_sym, strdup(args->leaf_srcline), args->node); + } return 0; } -- 2.52.0.457.g6b5491de43-goog