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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 8F72FC43465 for ; Fri, 18 Sep 2020 02:14:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50E7F239D1 for ; Fri, 18 Sep 2020 02:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395289; bh=vqwQ4uYZt+75ixq6ZlMMvT+NDrK26h6eRVKJj8lUKow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UahIjYGWCZ8K09q0OfQq1L+nkBFdSF4VB/iDz/yMZqa/XwgBGuOTwV9oGngYG5ckl 6U2HST5oC7e/Oo06LP2fKYCctXEfMsgkD4Nf2N91S+2xnlPIW0qY762rqNdsdFNp+Z Rf7oK6wARhTWaQp48RmT09i2ByZy4yvByemfvzPY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728366AbgIRCOr (ORCPT ); Thu, 17 Sep 2020 22:14:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:42824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729109AbgIRCOg (ORCPT ); Thu, 17 Sep 2020 22:14:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 98DA22376E; Fri, 18 Sep 2020 02:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395275; bh=vqwQ4uYZt+75ixq6ZlMMvT+NDrK26h6eRVKJj8lUKow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y85z4criFBqaDQAwPVQr+/xwbX9Fuzor2eLWPCkko2jSLbJbRV1qj3OreIzm570q+ Asj2V2kV402mu5AGVQA5mVq9pMrLWhZYe9ki09vCY9v+oyFRoGCd857HmsDAuMzjfy dHlM9winnOEnDk0O8iQFWeanao8Yqg+MkSiRWGTY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xie XiuQi , Alexander Shishkin , Hongbo Yao , Jiri Olsa , Li Bin , Mark Rutland , Namhyung Kim , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 4.14 113/127] perf util: Fix memory leak of prefix_if_not_in Date: Thu, 17 Sep 2020 22:12:06 -0400 Message-Id: <20200918021220.2066485-113-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918021220.2066485-1-sashal@kernel.org> References: <20200918021220.2066485-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xie XiuQi [ Upstream commit 07e9a6f538cbeecaf5c55b6f2991416f873cdcbd ] Need to free "str" before return when asprintf() failed to avoid memory leak. Signed-off-by: Xie XiuQi Cc: Alexander Shishkin Cc: Hongbo Yao Cc: Jiri Olsa Cc: Li Bin Cc: Mark Rutland Cc: Namhyung Kim Link: http://lore.kernel.org/lkml/20200521133218.30150-4-liwei391@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/sort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 84a33f1e9ec92..cd870129131e1 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -2667,7 +2667,7 @@ static char *prefix_if_not_in(const char *pre, char *str) return str; if (asprintf(&n, "%s,%s", pre, str) < 0) - return NULL; + n = NULL; free(str); return n; -- 2.25.1