From nobody Mon Feb 9 00:55:13 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36B50C7EE29 for ; Wed, 7 Jun 2023 01:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240650AbjFGBq5 (ORCPT ); Tue, 6 Jun 2023 21:46:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240639AbjFGBo6 (ORCPT ); Tue, 6 Jun 2023 21:44:58 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D0F21FE9 for ; Tue, 6 Jun 2023 18:44:52 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-56552a72cfbso112364007b3.3 for ; Tue, 06 Jun 2023 18:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686102291; x=1688694291; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=zgqIPituhIYk4GIizxY3KBqP+afAEkk8xXOmxl125Mk=; b=HnLdkuQtOLiT90PWkVp4H9hTUlBzohal9FoA0h1VTSuaG0fk5pvARqH4bvHgys/ylI nRsDZkK7TbfaLa8CUo2/C5PtEdnHu+x93qHzuLuXBVAVvhcTk4ugH7TzHwkPsje7MQC4 gyzjNrEuroULpjcc2kN6XN5N6DNIGFBfuvplwllQvVv60KGWc6FaGoe3uRrquPJvUCFi uTj7M3KS3Jz1dtq4uxgDXKw5v8Ja6aV3pdnAmjBirRk+3PJIwvv5jd20AmeaNLWMTYh9 AURpNFIOcEe1ZqcFMqR4LBjq1xATPfqV+ZOdQ6TXjDkwjd0prtLgRPgsK3uJH3pue1cz sXhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686102291; x=1688694291; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zgqIPituhIYk4GIizxY3KBqP+afAEkk8xXOmxl125Mk=; b=c6YKCXqSUg2Px22I8ueVdfZopsig7Xt51sFl6BMXibAs6ljUxzHlUmiX8t4+JVRf3d EfGUnhMoOroIh3h1KaxWgAlu86ZyROs2AKLAb73u0VgL9Q8QjQIFUlKXXJKjvQBdLuYV tmVE4O4/81lydSu2PYD6Wgi3wteZ8diPOtqsjUgclc+lwuxFXLDaR8LwukVyrR6zBPFM qR/Fxj9SseC4YlxE69w8faCGDm9G0r5l8khZQaD+c7JsNNQc1kwSYkv0CoKgz9MIlav5 Drz8svKwAagQy6JLAcPoP2aPHXhvDwoTfIHw5TOzHUMapInlgSn+as26HjfyYATX9cWT f5Ww== X-Gm-Message-State: AC+VfDyMaE7AK+G0ZuzuY0f19XUiAGhGGIAKFc2EMqnzc+IXJwxT+bM8 yBawHMRXBVEQRSaFM/H68z6mNjJiGVdt X-Google-Smtp-Source: ACHHUZ4O6AqHNMvW/AUh8p8vB2lzYbCObW6eg5wkLZW8uV+HB7fb+IhNsrmQhwAoI3a975hTDPdyJQX5bokn X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3c35:209f:5d38:b7a1]) (user=irogers job=sendgmr) by 2002:a81:4112:0:b0:54f:93c0:4ba8 with SMTP id o18-20020a814112000000b0054f93c04ba8mr2061450ywa.2.1686102290861; Tue, 06 Jun 2023 18:44:50 -0700 (PDT) Date: Tue, 6 Jun 2023 18:43:51 -0700 In-Reply-To: <20230607014353.3172466-1-irogers@google.com> Message-Id: <20230607014353.3172466-19-irogers@google.com> Mime-Version: 1.0 References: <20230607014353.3172466-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v1 18/20] perf machine: Fix leak of kernel dso From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Suzuki K Poulose , "Naveen N. Rao" , Kan Liang , German Gomez , Ali Saidi , Jing Zhang , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Athira Rajeev , Miguel Ojeda , ye xingchen , Liam Howlett , Dmitrii Dolgov <9erthalion6@gmail.com>, "Shawn M. Chapla" , Yang Jihong , K Prateek Nayak , Changbin Du , Ravi Bangoria , Sean Christopherson , Raul Silvera , Andi Kleen , "Steinar H. Gunderson" , Yuan Can , Brian Robbins , liuwenyu , Ivan Babrou , Fangrui Song , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The kernel dso may be found by searching dsos or allocating if not found. The allocation returns with a reference count of 2, once for the dsos list and once for the returned value. The list search has a reference count of 1, once for the dsos list. To make the reference counts consistent, increase the dsos list search reference count to 2 with a dso__get, and do a put when the scope ends for either the allocated or found dso. This issue was found with leak sanitizer and reference count checking. Signed-off-by: Ian Rogers --- tools/perf/util/machine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 46af5e9748c9..f8e6c07f0048 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1868,7 +1868,7 @@ static int machine__process_kernel_mmap_event(struct = machine *machine, continue; =20 =20 - kernel =3D dso; + kernel =3D dso__get(dso); break; } =20 @@ -1913,6 +1913,7 @@ static int machine__process_kernel_mmap_event(struct = machine *machine, */ dso__load(kernel, machine__kernel_map(machine)); } + dso__put(kernel); } else if (perf_event__is_extra_kernel_mmap(machine, xm)) { return machine__process_extra_kernel_map(machine, xm); } --=20 2.41.0.rc0.172.g3f132b7071-goog