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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77F90D6CFA6 for ; Thu, 22 Jan 2026 21:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zalmwLrK8cPj7cYoTUj/KkGE6/xfnap/Tev3VqTduZw=; b=4/mxq5ykG/tCZ1bw7hL61UmLF0 Jc8GPAMeD3nUTdrjbuq+k/0/BTOq6Po9UyR4TEIT+XG4UrrBEksdo/VufK9ht9eaKKkhUS3pFHPKL xBYrDdew7QWQEDTjKh7Ov9wJ7H4xXj8lQ2DTIOKjgWFuszO8Epogl/+5EhEVkJ06nDx+otieixk+F jLBETPfqvs52ufXlacinNFhn6XXPOhqCtbr+SfWvPg47BZapnSdirZ3Mqy2ScsXq0W3GjhG6D3jO3 aIcSeCCUzxh5W5/aMepZIWA9rE0fk5ImliRQSVdMyv8xLD2dNWG/yveJA9eQOHVGE2hYjU7T1N9MM ukrWiAkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vj2Kx-00000007mJY-2Y0M; Thu, 22 Jan 2026 21:35:31 +0000 Received: from mail-dl1-x1249.google.com ([2607:f8b0:4864:20::1249]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vj2Ks-00000007mGK-1jmH for linux-arm-kernel@lists.infradead.org; Thu, 22 Jan 2026 21:35:27 +0000 Received: by mail-dl1-x1249.google.com with SMTP id a92af1059eb24-1233b91de6bso2741378c88.1 for ; Thu, 22 Jan 2026 13:35:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769117725; x=1769722525; darn=lists.infradead.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=zalmwLrK8cPj7cYoTUj/KkGE6/xfnap/Tev3VqTduZw=; b=h4d4Tge1AVP91zfHYdXLCf5b5qgEDVWMnN9IvdrL8bby+9LVvTi+aGYk2IaE2Ny4pa MEI0wvVfBb0PXp0lFqiFfG/pS7Xw/vwsGjNGB4C6IeGVzTBD2fM9Oh++3mjL5k7KPzbW /hfp2HnyBn/Nu2GAF6l0II7dk9L9WA2v7Cy7PEPMZA8JjoYh89VuDRMqq3qGW1k/9jJH oUkpBTVytQlZyrr08okq1SsXwnT1H+5svJDMxNZ2F6CqnkAsAInXmd0PrdBDRjxH3wIL C/wbjLx1FygHAuUuBA5p9E/ThdJRxRZQGRTyb7u360lDMqvnz9O/AhA1U3xF5d4TkFS5 8tAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769117725; x=1769722525; 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=zalmwLrK8cPj7cYoTUj/KkGE6/xfnap/Tev3VqTduZw=; b=q/5Bps3CPEjNSXAeg5yoQJFWQ99NgK6vN5LrBBV8/gVZNaradWlqwOWuWZRHrrdSWh zG1OmwwIYe439/DHK1UAXZ42cSuC3/9Kp/SDf5VpyxwcUUZ/5Wn1h2fAE6ZQedc15QvU 1aXq8hEI8WxwSdDmtvav7EIvzlNCcAEJIFS2tABr2AYh+KkL3orEpdoPQrvw8kWPuPSC 4eSCD8F34y9md8x1ux+nOmG+edMdg0uicKg59kT4AJtNjsK8u2BYzRLlIX+217C3RSsg cfgG83k6i6CF65G4NgVB3au7Mn5GxAy5uOuAcvn3+me6kd448wABApW0P6SjM7MGIad+ 5HzQ== X-Forwarded-Encrypted: i=1; AJvYcCV65y70hQd8hZE0FFKVDOF1X25mPtwPAK0aBbhfVL4M7VUuSEy0ELCF99uQcwGv+Pc+uwGWeW4VcTjpV2k5Tf5O@lists.infradead.org X-Gm-Message-State: AOJu0Ywu7mP5Cmi8iSVyPu3g5E10uGagCxzwP2Khv+i/Hfy7yyXun1Qu ZjWNYNLHFhl3r7+GWQy7nKRNFNErDQ3iT+HLChMpwVcU7r2P01uFVIfO7yPUo8qIu3WG94P3FeO hSvYjjJoUIg== X-Received: from dlii17.prod.google.com ([2002:a05:7022:4191:b0:11d:cd2a:4c1b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2397:b0:119:e56b:91ea with SMTP id a92af1059eb24-1247dbf80ecmr276440c88.27.1769117724953; Thu, 22 Jan 2026 13:35:24 -0800 (PST) Date: Thu, 22 Jan 2026 13:35:05 -0800 In-Reply-To: <20260122213516.671089-1-irogers@google.com> Mime-Version: 1.0 References: <20260122213516.671089-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260122213516.671089-2-irogers@google.com> Subject: [PATCH v3 01/12] perf header: Fix memory leaks in process_cpu_domain_info From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , John Garry , Will Deacon , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Zecheng Li , Tianyou Li , Thomas Falcon , Julia Lawall , Suchit Karunakaran , Athira Rajeev , Aditya Bodkhe , Howard Chu , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Shimin Guo , 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 Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260122_133526_450208_6BD05A86 X-CRM114-Status: GOOD ( 12.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org do_read_string returns a string in allocated memory, for some reason there was unused memory allocations and unnecessary strdups. Remove these and make the "perf annotate basic tests" leak sanitizer clean. Signed-off-by: Ian Rogers Fixes: d40c68a49f69 ("perf header: Support CPU DOMAIN relation info") --- tools/perf/util/header.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 9a15dd4b7640..eefd1cd73b6a 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3634,6 +3634,7 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unused if (!d_info) return -1; + assert(cd_map[cpu]->domains[domain] == NULL); cd_map[cpu]->domains[domain] = d_info; d_info->domain = domain; @@ -3642,30 +3643,20 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unused if (!dname) return -1; - d_info->dname = zalloc(strlen(dname) + 1); - if (!d_info->dname) - return -1; - - d_info->dname = strdup(dname); + d_info->dname = dname; } cpumask = do_read_string(ff); if (!cpumask) return -1; - d_info->cpumask = zalloc(strlen(cpumask) + 1); - if (!d_info->cpumask) - return -1; - d_info->cpumask = strdup(cpumask); + d_info->cpumask = cpumask; cpulist = do_read_string(ff); if (!cpulist) return -1; - d_info->cpulist = zalloc(strlen(cpulist) + 1); - if (!d_info->cpulist) - return -1; - d_info->cpulist = strdup(cpulist); + d_info->cpulist = cpulist; } } -- 2.52.0.457.g6b5491de43-goog