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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B4B3EE49B7 for ; Wed, 11 Sep 2024 14:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fhvK5NWZMjrhUBnrJ125O4vBW3hfJXPgc+4KMMpaqts=; b=OAdnzmn/EIr39a2bVTLQ/X5pc6 RjUYaOXsLQsVMGP9ARI9QQcODmEWAHLOJRx2o39SZDdshUaYGyjbF3Ujha/NK/A3gDbN7+GEPfyob Go7b806FNbyDMhTS7gzmGKDQFximOhQ6LTfLW4kmoT0DMyIORu5MXyzfzfNEjBOxgQPY4z4aQNIJG x/JZouRGvVJVByyXpxT4HaGGH3S4fLAcHgGqXSaSxkgmP/FDdo/SvtnARap7flSCDVH1j0+id9bqc gVNq46STGVem/yan0+II7NPxMUW26cpwmr3ctJ5kRZbkuFBdEmixXrEO7rl0vRnRI2C2IEDZz7p8q ApBREzBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soONg-00000009v1Y-0Rah; Wed, 11 Sep 2024 14:31:40 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1soOJ2-00000009tYn-3wFk for linux-arm-kernel@lists.infradead.org; Wed, 11 Sep 2024 14:26:54 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 09BCDA41C65; Wed, 11 Sep 2024 14:26:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3A1DC4CEC0; Wed, 11 Sep 2024 14:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726064811; bh=GyOydcKwxKTqPcJaT9VvpHocCXPnTdPdYhYuSdMs/WQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fX23i1SB5C/j0YTxs1bA9zAMI/+DGjN1dbz7WQDSLeDvjXMJDHhtqMGj9Kgfto0tn o7Ba89sCX2BVYMVvR6hrvXJiK0JeY8aDOpnIMYlYkz46+Y4jBc/yEJUDEfOmvbmsMN y5huQveC4K9noRQO0DwCLC9VmpT/ZkQv3CjQmUJpUrCQDcmser4X7e1Zv5GHztcTvQ toswBOSKji+Bb8dQi3QRqgdKsJ26ctBU5iTsHiD9tA5WhXFwkJzXHcXzz84nGQHGjv JltP6g/0WLnfpq7jjcmdlcnUCL+HjlR53N1ZsdaaLj26zouu0QXVIhHjopC5YvpKmp l+KpUCk2SrP1w== Date: Wed, 11 Sep 2024 11:26:47 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ravi Bangoria , Weilin Wang , Jing Zhang , Xu Yang , Sandipan Das , Benjamin Gray , Athira Jajeev , Howard Chu , Dominique Martinet , Yang Jihong , Colin Ian King , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , Ze Gao , Andi Kleen , =?iso-8859-1?Q?Cl=E9ment?= Le Goffic , Sun Haiyong , Junhao He , Tiezhu Yang , Yicong Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v1 01/15] perf list: Avoid potential out of bounds memory read Message-ID: References: <20240907050830.6752-1-irogers@google.com> <20240907050830.6752-2-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240907050830.6752-2-irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240911_072653_049434_F91C53D8 X-CRM114-Status: GOOD ( 16.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Sep 06, 2024 at 10:08:16PM -0700, Ian Rogers wrote: > If a desc string is 0 length then -1 will be out of bounds, add a > check. Cherry picked this one. - Arnaldo > Signed-off-by: Ian Rogers > --- > tools/perf/builtin-list.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c > index 82cb4b1010aa..65b8cba324be 100644 > --- a/tools/perf/builtin-list.c > +++ b/tools/perf/builtin-list.c > @@ -173,7 +173,7 @@ static void default_print_event(void *ps, const char *pmu_name, const char *topi > if (pmu_name && strcmp(pmu_name, "default_core")) { > desc_len = strlen(desc); > desc_len = asprintf(&desc_with_unit, > - desc[desc_len - 1] != '.' > + desc_len > 0 && desc[desc_len - 1] != '.' > ? "%s. Unit: %s" : "%s Unit: %s", > desc, pmu_name); > } > -- > 2.46.0.469.g59c65b2a67-goog