From nobody Thu Apr 9 16:32:33 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 0AA0F3EFD1F for ; Fri, 6 Mar 2026 18:50:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772823028; cv=none; b=t/HNn/7/l8H2sujkWZfWL3C40Uc/zo2qonMTq9A/WlH9yy6qb3f8KPwwbKBgpl0MVHrVKBX5/6xzTmwQSRKONM2vJ3B2BMMk2OQcGYXdA9pYBUScgm2vzOyJqHCyUb1K8+ABVpbuCcvjKGcrOLXNOnMPT7Tkr2Rxq0/OezcHOBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772823028; c=relaxed/simple; bh=xn8nRn3PBEai+XwhzmEVhdf0J3gdqLpxs/5746Rxges=; h=Date:Mime-Version:Message-ID:Subject:From:To:Content-Type; b=MXnnj/BNUEn3TW0ONWUP4RDodaqUvpldpo8pzLKnuFEwGiW1B4Y0GAsBkvEyAYowAUhuuZaS7+RrMTOJiAoIHiRHeGyxrXJZE2B7zJpW2RaJpn6jFB3sfCMC5x6vLLE5DJCkJSRvn2bqgFtYAJeKP0b1hwXRkMd1PW4RMzksjB0= 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=BhyFh6kj; arc=none smtp.client-ip=74.125.82.201 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="BhyFh6kj" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2be21c6e2f5so62537825eec.1 for ; Fri, 06 Mar 2026 10:50:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772823026; x=1773427826; darn=vger.kernel.org; h=to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=52hfCZ16RpnGMPOUeS9KQdXOkClBKdKam0G4pLZQt5s=; b=BhyFh6kj6ZG85c8gFf9W94cLVAmZsmm2QnhJIs7NF0LTu78YbLaoa6OsCkulIxbTi5 0o03ozHMQALhNA37S29Pf1fZvapRXN9ZqPaEi5ZlRSbmc0piPNHjMbYgGaPPU+M4QeKZ 0cHiRKSl6o+SvdPRfUq2oDpZsTJFizoKJDsPUA3thEvII8r/+OrtyDvt+771GVHqufL0 /abEoYzq/Lpf2tdqEvaIykf5dFp4xGiBZJbAE+SQ6czLZKYoc1ZV4ieMkdvazwmQmgEs 9l4PXdcpxJPUqnIQIJ+tDr22+Pz7mIm90K0cUhNuF9ax9JjFoya+qRo2TWyN/CaPCjVl qNIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772823026; x=1773427826; h=to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=52hfCZ16RpnGMPOUeS9KQdXOkClBKdKam0G4pLZQt5s=; b=jKkS2F8pLRCvOtcwiaMQcHlODvMV4LHEgDNvZ5pPjyuk3ToZVzdRaP8U+C3WAjM/Lc 6yfdjUTRKE/ga4gUmCemn9VnItw7WusxirHUERcg7zIepgISMNY7I6Nwc772DVrG9EL5 PJJdTPiIPGeWu5jfUz/l7uQf5oyBksOHxWBNgRO7w1xyZDO9ZUkYvvxWIPLU1owApDlG ZcBvZkJp8+80u1+3tdAtFWpVyaq37ziGpoKH7v66eMcTnzSacJfIY1cikwMPO5kk6fti PC/89Nh6Xe2P5/DpF0AIcbuzpCmR+/G/YtTq8vxECLnkZW3LQxF0P+S0wE0Tw3gLUGT4 l6wQ== X-Forwarded-Encrypted: i=1; AJvYcCUBqZQBNOtwIaSY88ArEhiYpSJpAPSSJSyzK+rZZlJnGCrQDrT9NZ38LGzpoL54qzx/qr4MSAfXcAh8liI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5a+9Uz+8mGs0K2GjrgfQ2tgeHetEhHhE6720DSNf5rv0jesFZ j4t1OVUDzsL81hmhNNip6j0M4SvFCtD57yezGXt8xkEOa702VTzQ0GKCqM6Iu22D396P64slQ/g 050sI7hqH3A== X-Received: from dyfv3.prod.google.com ([2002:a05:7300:8243:b0:2be:1421:f19]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:1355:b0:2be:617:2dec with SMTP id 5a478bee46e88-2be4dfcc739mr1422007eec.17.1772823025919; Fri, 06 Mar 2026 10:50:25 -0800 (PST) Date: Fri, 6 Mar 2026 10:50:22 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260306185022.2016541-1-irogers@google.com> Subject: [PATCH v1] perf ftrace: Proper error clean up in print_profile_result From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ftrace profile_hash is cleaned up on success but not on memory allocation and empty paths. Fix by running the clean up for all. Free the profile too, so make it NULL, just for clarity that this is all clean up code. Signed-off-by: Ian Rogers --- tools/perf/builtin-ftrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 6b6eec65f93f..19e796e58fb0 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include =20 @@ -1369,17 +1370,17 @@ static int cmp_profile_data(const void *a, const vo= id *b) =20 static void print_profile_result(struct perf_ftrace *ftrace) { - struct hashmap_entry *entry, **profile; + struct hashmap_entry *entry, **profile =3D NULL; size_t i, nr, bkt; =20 nr =3D hashmap__size(ftrace->profile_hash); if (nr =3D=3D 0) - return; + goto out; =20 profile =3D calloc(nr, sizeof(*profile)); if (profile =3D=3D NULL) { pr_err("failed to allocate memory for the result\n"); - return; + goto out; } =20 i =3D 0; @@ -1403,6 +1404,7 @@ static void print_profile_result(struct perf_ftrace *= ftrace) p->st.max / 1000, p->st.max % 1000, p->st.n, name); } =20 +out: free(profile); =20 hashmap__for_each_entry(ftrace->profile_hash, entry, bkt) { --=20 2.53.0.473.g4a7958ca14-goog