From mboxrd@z Thu Jan 1 00:00:00 1970 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 5341C2E54A2 for ; Thu, 22 Jan 2026 16:54:25 +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=1769100876; cv=none; b=bGcFeBbzGuUnHFZyHby1F6ts5eJeVGLEFvE8q63pRLOVf4L2CBccZteX69MYoAOY1apYC69oAhNbd1VKIKUb9OEl1hgfewWNbnVo8BPoNFYk82gJtD3Od9+qYop5MBJfHk90geK4kaR5APArCKijqluGW9b1pE0oyMFyXAfclKY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100876; c=relaxed/simple; bh=WqOiFcX/heg3IGph3C/ogbRzFLpcL0diaA21e5ry5lo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=ZhvmQeh8iQknxhu7/Xc6PxIADQMySv4botVEV7JRBogm9hqMkx3OpG0TsqDu599ajRtABg+YPp5QwJ68y9RzViiGoRILYB50lJYo87HwtqdurVP0JugBP6/Wtu8/KA7HmOZJbjMyH4d6fO5U32dLXoGPvmOtWYrIyZEhOVRbY4M= 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=uSOMAGss; 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="uSOMAGss" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2b6f0b345e3so6299673eec.0 for ; Thu, 22 Jan 2026 08:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769100860; x=1769705660; 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=DnbHjkP7sr2MY8dvLIuI6wPgadGKGFiX6WTYohRo5Kw=; b=uSOMAGssh5dmLUIRtCZrmMb7VsAbqQZI773U2nrsh6m8PA55jIRS0RSIxlIKsCJ6iK Zhz9zetOv1Nu1TWCqnEY+EPbsLXuBXCN5uamUaEsA+Av8Ca9ubrvqplOew9lZKCAABrG OB4v8bO/RrpH48a7eA/TXKHwOqWoWGRVPE6Z+scupxkZi8D/W6eUMH954qd8LCDcmY2/ 4LkK8iuqSNuvDzZRDOj0NuwtwqG/84gW1vWTdXj33Mmt5eTjsPMNmI/Uyuq6EGezVw4+ fT6h0FVyqLO/ydTVbYlAffpMZtIqzrbaAAdBrZ4vOCMEQi9l1elMNwOz7p75WaV/b1dE 7PPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769100860; x=1769705660; 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=DnbHjkP7sr2MY8dvLIuI6wPgadGKGFiX6WTYohRo5Kw=; b=DK6jtq2brHRjF7JpsjiidZ+xws6v/s9QV9zWatCOcKT02Wk36osMk0yz8BCaSx6htR g0VzGsDqjROnhWXkYFOoFNbQJOCl/DBhwU4vd4C+/2fMdmh+spgaoieCymGJHTNaFZ63 /LNO9QKYWNBO058WT9CDGToSWyQfdHuV+taI6Dm8jMok6wjCFSF5zZmipsTM1XD/7FoZ J6+SHL7JDXDDvaK2pAQOo/pIsRSEsC+rP/eSuvPvGFedNlGeaS+Ee01O+d64u0w4ayMT xVGyoLMfA51pn4ZBj8RNKtSKPAvD+mjKGmtWe+va5CDlioIJ1X70VEhkknSYZZnbVnV4 UwZw== X-Forwarded-Encrypted: i=1; AJvYcCVBoRgJf1YHNpvtTeCWF22VdRzpURBq3NfTDQ3K9TPg5oaMZR+oWEKYe6m7b62JmqJXnEvY8qBnnKS2@vger.kernel.org X-Gm-Message-State: AOJu0YwwanJKvsS1Q7HMhn8gf4gL1fOgDuC7tCiUPSP5uczAccopYZ7v 5pheGTuR2alr/5SVMENGdUMcMzyp3jLzkhjbBWLOlyzzpPVVqV+J7HuNudDtkB48kC9bsWqQCe8 Q3zIPteteiQ== X-Received: from dycue4.prod.google.com ([2002:a05:7300:84:b0:2ae:5283:d72f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:7c13:b0:2ae:824e:31ba with SMTP id 5a478bee46e88-2b6b3eed5d9mr19877803eec.7.1769100860046; Thu, 22 Jan 2026 08:54:20 -0800 (PST) Date: Thu, 22 Jan 2026 08:53:58 -0800 In-Reply-To: <20260122165407.561888-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: <20260122165407.561888-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260122165407.561888-4-irogers@google.com> Subject: [PATCH v2 03/12] perf maps: Fix reference count leak in maps__find_ams 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" ams and so ams->ms.map is an in argument, however, it is also overwritten. As a map is reference counted, ensure a map__put is done before overwriting it. Signed-off-by: Ian Rogers Fixes: 42fd623b58db ("perf maps: Get map before returning in maps__find") --- tools/perf/util/maps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 8ccc46d515b6..4092211cff62 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -708,6 +708,7 @@ int maps__find_ams(struct maps *maps, struct addr_map_symbol *ams) if (ams->addr < map__start(ams->ms.map) || ams->addr >= map__end(ams->ms.map)) { if (maps == NULL) return -1; + map__put(ams->ms.map); ams->ms.map = maps__find(maps, ams->addr); if (ams->ms.map == NULL) return -1; -- 2.52.0.457.g6b5491de43-goog