[1/1] perf probe: Free string returned by synthesize_perf_probe_point() on failure to add a probe
Message ID | ZM0l1Oxamr4SVjfY@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp10445vqr; Fri, 4 Aug 2023 11:02:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGS+N3TcpH2jRVFb5uF/bcPvkUiGUlYAxSq/Q5L4iG3RtVvLEypW8IhtU77RYzu0tPFLqLY X-Received: by 2002:aa7:d0c3:0:b0:522:4dd0:de72 with SMTP id u3-20020aa7d0c3000000b005224dd0de72mr1885246edo.27.1691172155562; Fri, 04 Aug 2023 11:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691172155; cv=none; d=google.com; s=arc-20160816; b=YM220xLite+d44raSr/r6vpPNDPWUdX+5m+oyV+LDvvVUKt8ExX52WpPuJdvQX9VuF daS2ICUiWxYRvkcBxUdE7D58tLnyqRYDV4AgRw6W1MkTOt2kL3JQXnSC+NbZsNFpXj0R erVGUuIVnBnn5Wi2xybGCGCaLKNDL5RZIm3/HpOnXJAWV9lW5julTDH9VlwvRTSNGEwg nqzUi6C94JGahYDdi8W6Wx5CcNuK5ZK/GzolN5vPuEwgT2YtogyOk2bzB/EwK1vr3N+d 6IgIfUEQFMeyj77XQdkEK5fIpDLwrTgHgMvOMHzO0ep93+r6zTkgSXv/mmKrIVbgaAR8 Oadg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=RGdpwmpEwLHFpingYi/v8oe/VnPfa8WGV/RAheh3mM4=; fh=Kn7JZodw35s50fWKjdRVXYXH28v8+weD7e9SXWnRImI=; b=UZC82IFZe7QfoXAB3LOGBVwLEkfiVyJaFKNj9hwsyGzV/m8WQeZoB9hFgaMiLIclur 2pGEwwmwbnkfFjtrYe4uWmIJyFAGaSQX/DOUFjE8ZnUNn7bmxsoaZqnpz/yB9vWDNfIo gd+CQuIeMBpwThX5pfcgXz8nJVAH6l+sLXWNPXAhBRG9POuc+C8QtvQHAorl+gadfuWs Ms/2x319Wkj9p6xVwv6Jq4AEeoPTt0L6y4RH5RmJsPMZPc0fED+YWrkgqTiN/ghmKVga /l7lxQ9iSqS8leXEbrZMMoHKh2MkMdb+WxfIJfqgEXzwmbxspSxPbG74ojC2No2co4IX hfFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Nlr7EZP6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020aa7de05000000b0051e5322a64dsi728137edv.420.2023.08.04.11.02.10; Fri, 04 Aug 2023 11:02:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Nlr7EZP6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229806AbjHDQWv (ORCPT <rfc822;sukrut.bellary@gmail.com> + 99 others); Fri, 4 Aug 2023 12:22:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjHDQWt (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 4 Aug 2023 12:22:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7318D195 for <linux-kernel@vger.kernel.org>; Fri, 4 Aug 2023 09:22:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0797C620A2 for <linux-kernel@vger.kernel.org>; Fri, 4 Aug 2023 16:22:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3905EC433C8; Fri, 4 Aug 2023 16:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691166167; bh=7rhZIvH5sJeD77KvNvcGVzKHelr8chrcXaumVXlFcmc=; h=Date:From:To:Cc:Subject:From; b=Nlr7EZP6M0h2wPj7fLjJDiEdhOPCjWgr/0IL8QiL+fyZzwD5Rs59PGcvZstpMewdn YW06C4TaQXiBVXNxY9gzokr0Z8mFe5RF69jGW4nVnMoiaEejT2bAL8FEoDqSMxK6CO 1+zKOXN2BZ0Q7VEBrEM27A9283Q9apwV26W7UOwEDyzG7T7Ih+OecGSF0hBKCChGGf 8bhJRh7WXXSd+SVJVSmK8cFt4nYI6N+J2aoXSDzfaXpbgHWuf+2883tu7ZMKcEPSod vvc+LTWeyoY4GUJgGNEHj2oD9DXvT0LMslcbFpYR5OFBoItHLXFdGjEbuXgh/STxut 7x6EdvV1R0Y5g== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 660B0404DF; Fri, 4 Aug 2023 13:22:44 -0300 (-03) Date: Fri, 4 Aug 2023 13:22:44 -0300 From: Arnaldo Carvalho de Melo <acme@kernel.org> To: Masami Hiramatsu <mhiramat@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com>, Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: [PATCH 1/1] perf probe: Free string returned by synthesize_perf_probe_point() on failure to add a probe Message-ID: <ZM0l1Oxamr4SVjfY@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773322534448966674 X-GMAIL-MSGID: 1773322534448966674 |
Series |
[1/1] perf probe: Free string returned by synthesize_perf_probe_point() on failure to add a probe
|
|
Commit Message
Arnaldo Carvalho de Melo
Aug. 4, 2023, 4:22 p.m. UTC
Building perf with EXTRA_CFLAGS="-fsanitize=address" a leak is detect
when trying to add a probe to a non-existent function:
# perf probe -x ~/bin/perf dso__neW
Probe point 'dso__neW' not found.
Error: Failed to add events.
=================================================================
==296634==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 128 byte(s) in 1 object(s) allocated from:
#0 0x7f67642ba097 in calloc (/lib64/libasan.so.8+0xba097)
#1 0x7f67641a76f1 in allocate_cfi (/lib64/libdw.so.1+0x3f6f1)
Direct leak of 65 byte(s) in 1 object(s) allocated from:
#0 0x7f67642b95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5)
#1 0x6cac75 in strbuf_grow util/strbuf.c:64
#2 0x6ca934 in strbuf_init util/strbuf.c:25
#3 0x9337d2 in synthesize_perf_probe_point util/probe-event.c:2018
#4 0x92be51 in try_to_find_probe_trace_events util/probe-event.c:964
#5 0x93d5c6 in convert_to_probe_trace_events util/probe-event.c:3512
#6 0x93d6d5 in convert_perf_probe_events util/probe-event.c:3529
#7 0x56f37f in perf_add_probe_events /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:354
#8 0x572fbc in __cmd_probe /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:738
#9 0x5730f2 in cmd_probe /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:766
#10 0x635d81 in run_builtin /var/home/acme/git/perf-tools-next/tools/perf/perf.c:323
#11 0x6362c1 in handle_internal_command /var/home/acme/git/perf-tools-next/tools/perf/perf.c:377
#12 0x63667a in run_argv /var/home/acme/git/perf-tools-next/tools/perf/perf.c:421
#13 0x636b8d in main /var/home/acme/git/perf-tools-next/tools/perf/perf.c:537
#14 0x7f676302950f in __libc_start_call_main (/lib64/libc.so.6+0x2950f)
SUMMARY: AddressSanitizer: 193 byte(s) leaked in 2 allocation(s).
#
synthesize_perf_probe_point() returns a "detached" strbuf, i.e. a
malloc'ed string that needs to be free'd.
An audit will be performed to find other such cases.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-event.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Comments
On Fri, 4 Aug 2023 13:22:44 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > Building perf with EXTRA_CFLAGS="-fsanitize=address" a leak is detect > when trying to add a probe to a non-existent function: > > # perf probe -x ~/bin/perf dso__neW > Probe point 'dso__neW' not found. > Error: Failed to add events. > > ================================================================= > ==296634==ERROR: LeakSanitizer: detected memory leaks > > Direct leak of 128 byte(s) in 1 object(s) allocated from: > #0 0x7f67642ba097 in calloc (/lib64/libasan.so.8+0xba097) > #1 0x7f67641a76f1 in allocate_cfi (/lib64/libdw.so.1+0x3f6f1) > > Direct leak of 65 byte(s) in 1 object(s) allocated from: > #0 0x7f67642b95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) > #1 0x6cac75 in strbuf_grow util/strbuf.c:64 > #2 0x6ca934 in strbuf_init util/strbuf.c:25 > #3 0x9337d2 in synthesize_perf_probe_point util/probe-event.c:2018 > #4 0x92be51 in try_to_find_probe_trace_events util/probe-event.c:964 > #5 0x93d5c6 in convert_to_probe_trace_events util/probe-event.c:3512 > #6 0x93d6d5 in convert_perf_probe_events util/probe-event.c:3529 > #7 0x56f37f in perf_add_probe_events /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:354 > #8 0x572fbc in __cmd_probe /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:738 > #9 0x5730f2 in cmd_probe /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:766 > #10 0x635d81 in run_builtin /var/home/acme/git/perf-tools-next/tools/perf/perf.c:323 > #11 0x6362c1 in handle_internal_command /var/home/acme/git/perf-tools-next/tools/perf/perf.c:377 > #12 0x63667a in run_argv /var/home/acme/git/perf-tools-next/tools/perf/perf.c:421 > #13 0x636b8d in main /var/home/acme/git/perf-tools-next/tools/perf/perf.c:537 > #14 0x7f676302950f in __libc_start_call_main (/lib64/libc.so.6+0x2950f) > > SUMMARY: AddressSanitizer: 193 byte(s) leaked in 2 allocation(s). > # > > synthesize_perf_probe_point() returns a "detached" strbuf, i.e. a > malloc'ed string that needs to be free'd. > > An audit will be performed to find other such cases. Thanks for finding it! Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> > > Cc: Adrian Hunter <adrian.hunter@intel.com> > Cc: Ian Rogers <irogers@google.com> > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: Masami Hiramatsu <mhiramat@kernel.org> > Cc: Namhyung Kim <namhyung@kernel.org> > Link: https://lore.kernel.org/lkml/ > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > --- > tools/perf/util/probe-event.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > index 2d056f02ae408a64..c7bfeab610a3679a 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -961,8 +961,9 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, > debuginfo__delete(dinfo); > > if (ntevs == 0) { /* No error but failed to find probe point. */ > - pr_warning("Probe point '%s' not found.\n", > - synthesize_perf_probe_point(&pev->point)); > + char *probe_point = synthesize_perf_probe_point(&pev->point); > + pr_warning("Probe point '%s' not found.\n", probe_point); > + free(probe_point); > return -ENODEV; > } else if (ntevs < 0) { > /* Error path : ntevs < 0 */ > -- > 2.37.1 >
Em Sat, Aug 05, 2023 at 11:01:48PM +0900, Masami Hiramatsu escreveu: > On Fri, 4 Aug 2023 13:22:44 -0300 > Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > > Building perf with EXTRA_CFLAGS="-fsanitize=address" a leak is detect > > when trying to add a probe to a non-existent function: > > > > # perf probe -x ~/bin/perf dso__neW > > Probe point 'dso__neW' not found. > > Error: Failed to add events. > > > > ================================================================= > > ==296634==ERROR: LeakSanitizer: detected memory leaks > > > > Direct leak of 128 byte(s) in 1 object(s) allocated from: > > #0 0x7f67642ba097 in calloc (/lib64/libasan.so.8+0xba097) > > #1 0x7f67641a76f1 in allocate_cfi (/lib64/libdw.so.1+0x3f6f1) > > > > Direct leak of 65 byte(s) in 1 object(s) allocated from: > > #0 0x7f67642b95b5 in __interceptor_realloc.part.0 (/lib64/libasan.so.8+0xb95b5) > > #1 0x6cac75 in strbuf_grow util/strbuf.c:64 > > #2 0x6ca934 in strbuf_init util/strbuf.c:25 > > #3 0x9337d2 in synthesize_perf_probe_point util/probe-event.c:2018 > > #4 0x92be51 in try_to_find_probe_trace_events util/probe-event.c:964 > > #5 0x93d5c6 in convert_to_probe_trace_events util/probe-event.c:3512 > > #6 0x93d6d5 in convert_perf_probe_events util/probe-event.c:3529 > > #7 0x56f37f in perf_add_probe_events /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:354 > > #8 0x572fbc in __cmd_probe /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:738 > > #9 0x5730f2 in cmd_probe /var/home/acme/git/perf-tools-next/tools/perf/builtin-probe.c:766 > > #10 0x635d81 in run_builtin /var/home/acme/git/perf-tools-next/tools/perf/perf.c:323 > > #11 0x6362c1 in handle_internal_command /var/home/acme/git/perf-tools-next/tools/perf/perf.c:377 > > #12 0x63667a in run_argv /var/home/acme/git/perf-tools-next/tools/perf/perf.c:421 > > #13 0x636b8d in main /var/home/acme/git/perf-tools-next/tools/perf/perf.c:537 > > #14 0x7f676302950f in __libc_start_call_main (/lib64/libc.so.6+0x2950f) > > > > SUMMARY: AddressSanitizer: 193 byte(s) leaked in 2 allocation(s). > > # > > > > synthesize_perf_probe_point() returns a "detached" strbuf, i.e. a > > malloc'ed string that needs to be free'd. > > > > An audit will be performed to find other such cases. > > Thanks for finding it! > > Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Thanks, added the tag. - Arnaldo > > > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > Cc: Ian Rogers <irogers@google.com> > > Cc: Jiri Olsa <jolsa@kernel.org> > > Cc: Masami Hiramatsu <mhiramat@kernel.org> > > Cc: Namhyung Kim <namhyung@kernel.org> > > Link: https://lore.kernel.org/lkml/ > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > --- > > tools/perf/util/probe-event.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > > index 2d056f02ae408a64..c7bfeab610a3679a 100644 > > --- a/tools/perf/util/probe-event.c > > +++ b/tools/perf/util/probe-event.c > > @@ -961,8 +961,9 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, > > debuginfo__delete(dinfo); > > > > if (ntevs == 0) { /* No error but failed to find probe point. */ > > - pr_warning("Probe point '%s' not found.\n", > > - synthesize_perf_probe_point(&pev->point)); > > + char *probe_point = synthesize_perf_probe_point(&pev->point); > > + pr_warning("Probe point '%s' not found.\n", probe_point); > > + free(probe_point); > > return -ENODEV; > > } else if (ntevs < 0) { > > /* Error path : ntevs < 0 */ > > -- > > 2.37.1 > > > > > -- > Masami Hiramatsu (Google) <mhiramat@kernel.org>
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 2d056f02ae408a64..c7bfeab610a3679a 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -961,8 +961,9 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, debuginfo__delete(dinfo); if (ntevs == 0) { /* No error but failed to find probe point. */ - pr_warning("Probe point '%s' not found.\n", - synthesize_perf_probe_point(&pev->point)); + char *probe_point = synthesize_perf_probe_point(&pev->point); + pr_warning("Probe point '%s' not found.\n", probe_point); + free(probe_point); return -ENODEV; } else if (ntevs < 0) { /* Error path : ntevs < 0 */