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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 681B9C47083 for ; Fri, 4 Jun 2021 04:16:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F4B2613AA for ; Fri, 4 Jun 2021 04:16:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229786AbhFDESm (ORCPT ); Fri, 4 Jun 2021 00:18:42 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:43778 "EHLO mail-wm1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229474AbhFDESm (ORCPT ); Fri, 4 Jun 2021 00:18:42 -0400 Received: by mail-wm1-f50.google.com with SMTP id 3-20020a05600c0243b029019f2f9b2b8aso4828650wmj.2 for ; Thu, 03 Jun 2021 21:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gt5r+lBwCuoOA7rfQIlaZBhTcz5xyY6ZuYMcbufKUos=; b=pXfVS0SZxq556lEc4rP04GJ+qgvT/OfgZ6GWjum1lWJGmFlLn0UIhfcmvLozoTMPl6 dFTZer+0saAoVGELO7+tFHPmONEOIFsP/2B24YoqJOSbVT1Qbp8MhvrOythK2lI8ZcSK lfYFhogf0BkpuuMQ2vgzYsV8SBe/Z3umeGLXeDHcPOzyosYXZtapt4idJ2Vgt79tiV9A AcbR/UUZJt4JO0HYV6GSl49RUNE1HAZ2Z0kxIct7cR2hyhnysXQ8LN/yGMV/3gz1E023 MEqggsPvjm0V4piYAYa5Td9JqYxf4aWJnqMAdcuRpsoKH9W/EmMQmuiHJ3kT+W4xV1Va zFFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gt5r+lBwCuoOA7rfQIlaZBhTcz5xyY6ZuYMcbufKUos=; b=kajmKYWCHinZ0XFN8KNqIZ4zIghRu/9KfaMl8vzatfpP2lUZZtWO8efSvAU6YR1zQi UAiqPonSqiHut64/FMEqmWESq9ZCXd4V4KbiKtgySZoVfXYk0CBfQDC2VD8At1x61OXv OZdmfZNcYDOQypZwj42v5lwWzNlCwmPzohgynEzL9AaSx5jUnG/IyXmpdo1wrifHcBqF cDc8iPT2JMKEvmdVoMyCPrIFhw3zXyh51VCDog8SSTfU/Gs3mrZKgJB3+8oaTo7vT9GQ +xZn015BIwfZwZbfiH1RgYyKx09k5CtXZNj43aLcSWsVTRd/C/tz458OFFx7VLcFCJg8 kl2g== X-Gm-Message-State: AOAM533glh12AXMlF0xlh5i0l/7IZ2nsPfMPuPpSlHMYO2tNIXTNZf6J 7gZTvd62uwIlbJ0S+suRQOZfOia3ww7KYtsg+kTtiQ== X-Google-Smtp-Source: ABdhPJx2vWndMsU19H1kNaO6+JL/13qRYUi8/RATBdr+TJtyTLGIJgpuoWpiH5i1lF4ag++WCkz/IclGw42XD007YWQ= X-Received: by 2002:a1c:b603:: with SMTP id g3mr1451928wmf.58.1622780145144; Thu, 03 Jun 2021 21:15:45 -0700 (PDT) MIME-Version: 1.0 References: <20210602224024.300485-1-rickyman7@gmail.com> In-Reply-To: <20210602224024.300485-1-rickyman7@gmail.com> From: Ian Rogers Date: Thu, 3 Jun 2021 21:15:32 -0700 Message-ID: Subject: Re: [PATCH] perf env: fix memory leak: free bpf_prog_info_linear To: Riccardo Mancini Cc: Arnaldo Carvalho de Melo , Namhyung Kim , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , linux-perf-users , LKML , Networking , bpf Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 2, 2021 at 3:41 PM Riccardo Mancini wrote: > > ASan reported a memory leak caused by info_linear not being > deallocated. The info_linear was allocated during > perf_event__synthesize_one_bpf_prog. > This patch adds the corresponding free() when bpf_prog_info_node > is freed in perf_env__purge_bpf. > > $ sudo ./perf record -- sleep 5 > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.025 MB perf.data (8 samples) ] > > ================================================================= > ==297735==ERROR: LeakSanitizer: detected memory leaks > > Direct leak of 7688 byte(s) in 19 object(s) allocated from: > #0 0x4f420f in malloc (/home/user/linux/tools/perf/perf+0x4f420f) > #1 0xc06a74 in bpf_program__get_prog_info_linear /home/user/linux/tools/lib/bpf/libbpf.c:11113:16 > #2 0xb426fe in perf_event__synthesize_one_bpf_prog /home/user/linux/tools/perf/util/bpf-event.c:191:16 > #3 0xb42008 in perf_event__synthesize_bpf_events /home/user/linux/tools/perf/util/bpf-event.c:410:9 > #4 0x594596 in record__synthesize /home/user/linux/tools/perf/builtin-record.c:1490:8 > #5 0x58c9ac in __cmd_record /home/user/linux/tools/perf/builtin-record.c:1798:8 > #6 0x58990b in cmd_record /home/user/linux/tools/perf/builtin-record.c:2901:8 > #7 0x7b2a20 in run_builtin /home/user/linux/tools/perf/perf.c:313:11 > #8 0x7b12ff in handle_internal_command /home/user/linux/tools/perf/perf.c:365:8 > #9 0x7b2583 in run_argv /home/user/linux/tools/perf/perf.c:409:2 > #10 0x7b0d79 in main /home/user/linux/tools/perf/perf.c:539:3 > #11 0x7fa357ef6b74 in __libc_start_main /usr/src/debug/glibc-2.33-8.fc34.x86_64/csu/../csu/libc-start.c:332:16 > > Signed-off-by: Riccardo Mancini Acked-by: Ian Rogers Thanks, Ian > --- > tools/perf/util/env.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c > index 9130f6fad8d54..bc5e4f294e9e9 100644 > --- a/tools/perf/util/env.c > +++ b/tools/perf/util/env.c > @@ -144,6 +144,7 @@ static void perf_env__purge_bpf(struct perf_env *env) > node = rb_entry(next, struct bpf_prog_info_node, rb_node); > next = rb_next(&node->rb_node); > rb_erase(&node->rb_node, root); > + free(node->info_linear); > free(node); > } > > -- > 2.31.1 >