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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham 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 18FDAC2D0E4 for ; Fri, 27 Nov 2020 07:46:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB47F2222C for ; Fri, 27 Nov 2020 07:46:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392751AbgK0Hpu (ORCPT ); Fri, 27 Nov 2020 02:45:50 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:8599 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388333AbgK0Hpu (ORCPT ); Fri, 27 Nov 2020 02:45:50 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Cj69T60lGzLvt5; Fri, 27 Nov 2020 15:45:17 +0800 (CST) Received: from [10.174.178.154] (10.174.178.154) by smtp.huawei.com (10.3.19.203) with Microsoft SMTP Server (TLS) id 14.3.487.0; Fri, 27 Nov 2020 15:45:40 +0800 Subject: Re: [PATCH -next] perf util: Fix memory leak in __parse_regs() To: Jiri Olsa CC: , , , , , References: <20200703093344.189450-1-zhengzengkai@huawei.com> <20200703103106.GA3261456@krava> From: Zheng Zengkai Message-ID: <0e52c7be-ca81-2f4d-ee2f-8f9ced382f60@huawei.com> Date: Fri, 27 Nov 2020 15:45:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20200703103106.GA3261456@krava> Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.178.154] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ping... > On Fri, Jul 03, 2020 at 05:33:44PM +0800, Zheng Zengkai wrote: >> when using perf record option '-I' or '--user-regs=' >> along with argument '?' to list available register names, >> memory of variable 'os' allocated by strdup() needs to be released >> before __parse_regs() returns, otherwise memory leak will occur. >> >> Fixes: bcc84ec65ad1 ("perf record: Add ability to name registers to record") >> Signed-off-by: Zheng Zengkai > Acked-by: Jiri Olsa > > thanks, > jirka > >> --- >> tools/perf/util/parse-regs-options.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tools/perf/util/parse-regs-options.c b/tools/perf/util/parse-regs-options.c >> index e687497b3aac..a4a100425b3a 100644 >> --- a/tools/perf/util/parse-regs-options.c >> +++ b/tools/perf/util/parse-regs-options.c >> @@ -54,7 +54,7 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr) >> #endif >> fputc('\n', stderr); >> /* just printing available regs */ >> - return -1; >> + goto error; >> } >> #ifdef HAVE_PERF_REGS_SUPPORT >> for (r = sample_reg_masks; r->name; r++) { >> -- >> 2.20.1 >> > . >