From patchwork Tue Sep 8 15:24:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 309934 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 B9085C43461 for ; Tue, 8 Sep 2020 19:15:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 796B620C09 for ; Tue, 8 Sep 2020 19:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599592513; bh=EXGBLxErFJSF4VLwQyO8FppM6IWx1j6ZUvdeyM5Rk9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cJ7DTlARPL/rMokJwPT52zqHM9nnc63V1R8ZvJgceP1HAJ0rV7SawL+5KTiaVNGuo JMrUqdBj0GMNMCqa8hswRsi9WaIW2kSVicrEGVv1xuAlnfDIZCxrtUwHltYkjZQm/q gu5LPYzeZvwDB23i8hjbZEg6nyinT2D1OAfxLxY0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731786AbgIHTPL (ORCPT ); Tue, 8 Sep 2020 15:15:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:52178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730303AbgIHQEu (ORCPT ); Tue, 8 Sep 2020 12:04:50 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A43CC24078; Tue, 8 Sep 2020 15:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579507; bh=EXGBLxErFJSF4VLwQyO8FppM6IWx1j6ZUvdeyM5Rk9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Juypm0yIYPHcm78GUD0hUnuKKKQRc7DVBifMzgGv8n015jhylnTm171gbx2p+khO6 y0ZotG3XDwlNtchzdZFaXjS/6fwXz2MrhAQfnOvxa1dZloU7J/aa3uB67y0tk6usXB Fgg2lUAlQJyi+CjukaEP6Q81Vm81ylQGrmqUlb70= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Namhyung Kim , Ian Rogers , Alexander Shishkin , Andi Kleen , Jiri Olsa , John Garry , Kajol Jain , Mark Rutland , Peter Zijlstra , Stephane Eranian , William Cohen , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.8 105/186] perf jevents: Fix suspicious code in fixregex() Date: Tue, 8 Sep 2020 17:24:07 +0200 Message-Id: <20200908152246.724078464@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Namhyung Kim [ Upstream commit e62458e3940eb3dfb009481850e140fbee183b04 ] The new string should have enough space for the original string and the back slashes IMHO. Fixes: fbc2844e84038ce3 ("perf vendor events: Use more flexible pattern matching for CPU identification for mapfile.csv") Signed-off-by: Namhyung Kim Reviewed-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: John Garry Cc: Kajol Jain Cc: Mark Rutland Cc: Peter Zijlstra Cc: Stephane Eranian Cc: William Cohen Link: http://lore.kernel.org/lkml/20200903152510.489233-1-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/pmu-events/jevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index fa86c5f997cc5..fc9c158bfa134 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -137,7 +137,7 @@ static char *fixregex(char *s) return s; /* allocate space for a new string */ - fixed = (char *) malloc(len + 1); + fixed = (char *) malloc(len + esc_count + 1); if (!fixed) return NULL;