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 15646D3EE92 for ; Thu, 22 Jan 2026 16:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Message-ID:References: Mime-Version:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ysjf97+1ljy3V+a/lYD6GKjReLTpUUqZfvbu2WsNlAY=; b=WRh8kQ1H565EbM IcmxAPui2Oxxz8XZbb71xOWNIH/m7WZRqhpxiHSYbaAikkvMjP4ObP928yGCczITpPEkhSsGpVmMd DKR56D5VcfdL9/Z3+ws6I/gWoEnMpj2p7SRguoggxfD1qSIWvwNvrjsd4VDbKNUgX8ndZ+gHuxGGr dBqg68YWAqtY+Sf8suTroO4NG51swhMNXUjjeaO2hzzRDgqoT9kWN3jkvHmCt+G2HcrnS5/mQE/zL TLf+3tviR2TxYuVcO6EZCqd6drRnNWbURCjF+IIX/67a9t3iu3p1Euq9jQRixTQxEbpN+qFIt3pW8 pXtHzESqkWsH5Ej+bLTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vixwq-00000007Ten-2p6A; Thu, 22 Jan 2026 16:54:20 +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 1vixwo-00000007Td4-1j2j for linux-riscv@lists.infradead.org; Thu, 22 Jan 2026 16:54:19 +0000 Received: by mail-dl1-x1249.google.com with SMTP id a92af1059eb24-1247bb4db53so432433c88.1 for ; Thu, 22 Jan 2026 08:54:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769100856; x=1769705656; 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=3gqe7CFUGvzeV1S0/tIW1RMh3X+0VhkHAa8AO7g73gRp1bUYYkjjQpwcH0o/1FmJmr fW1ykP7MkvAqXa9zRxi4MQ2VE36VPJJiIfDmUcpHz4BcWjs6ARk6WeDlBUyahcnL+f3B UNbPpRvGUkxg1P0x0vVeBK/grYT8gJwdAPgKKfb6gDZ11v9eNErz6T+73k1rwzgmO538 sUBmbWbZf630bZ4EvRlSX2B01D/UHT4RYp4zHmDG4FXYVx3mQCKj1cGz/iinzBSxipBe evd4cLSLEKV0Xro1fL0pii2LlHCiYsb5OG8kIuLDevj11B4dXGfTe9lMOkRxXGtDcaak VHcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769100856; x=1769705656; 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=swhsCufp5vxgodw6oZBn+B618K3Qgt2731MdFFxVQCfQlvTgRpeUDi2jGbGdJ8j35L vm3AFGaSl+MMSKaRCZ4qNQBfgiJ71crai0rZXTl4KvlBXXmWL5zqMBTycrsi2u9q5Oli W7zINE6brYMPxcuexsRqhoa3G4cVENkcqsFfTKOeSb8Na7q+CrVTxNUAEBNeln6JTIQ0 0tvuBeUaD5fCPeGLjeJy5SH7AUVhOawf49AwpvKOr6bT/IfpTQ8rjRA8249U3gxH43Ih fZN60ap011Hne1O5gM46C93UeKzfchIYxkf05oFeremowcCGihoV30YLT3kuAF0WWplU vMXQ== X-Forwarded-Encrypted: i=1; AJvYcCUZPW3eiGf5RFEgJFClOzZ0MeQYNznfo6SsBAQoUjTuNUslDgm8mn1Ieskg0RFVidcD/a+GGGCWL0M8nA==@lists.infradead.org X-Gm-Message-State: AOJu0YywAWL8RrX8k8C44q4Ba5FPbTw4u3Lt3vPumSUXzoCTUKT141N0 ahxtLJUOCji7w1ECn+MpKij45ikBpKGry4aWDm6mYnDZPXbV5jLdmyLc4S5z1dRdPINuTAlKRMq vE49ovMVCxA== X-Received: from dlbqj5.prod.google.com ([2002:a05:7022:ec05:b0:123:2b17:f461]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:4582:b0:11b:95fe:bee3 with SMTP id a92af1059eb24-1246aabf3f6mr7269627c88.37.1769100856331; Thu, 22 Jan 2026 08:54:16 -0800 (PST) Date: Thu, 22 Jan 2026 08:53:56 -0800 In-Reply-To: <20260122165407.561888-1-irogers@google.com> Mime-Version: 1.0 References: <20260122165407.561888-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260122165407.561888-2-irogers@google.com> Subject: [PATCH v2 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260122_085418_454454_15CCB658 X-CRM114-Status: GOOD ( 10.52 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv