From patchwork Tue Sep 29 11:00:40 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: 290778 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=-13.5 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=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 3FB0BC4727F for ; Tue, 29 Sep 2020 12:37:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D705220789 for ; Tue, 29 Sep 2020 12:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601383040; bh=vqwQ4uYZt+75ixq6ZlMMvT+NDrK26h6eRVKJj8lUKow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BBm/ycJ9G0wG8AsqzOhsDjbjXVBC3AWZpNWPgoO154qYKDqHGfUmN0mO5bm9vJu/P zHA1p8FNFFmBCo6CvFoK4qYGxOinE3imzyAvotySAeFFuTr8jHhqtKYUcnMcFRT4SJ iT+LTEwt+EwANk3jfJXo63wS3RvzspGJ88f9KtD8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730500AbgI2MhC (ORCPT ); Tue, 29 Sep 2020 08:37:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:35518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729021AbgI2LU6 (ORCPT ); Tue, 29 Sep 2020 07:20:58 -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 5138E221EC; Tue, 29 Sep 2020 11:18:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378288; bh=vqwQ4uYZt+75ixq6ZlMMvT+NDrK26h6eRVKJj8lUKow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lvwZtqzM277AgH2hYQWid9cCh/kEK2Ox/GywDH37w+0mjGyD2J9hmDpOkb6fnF3Ng 1C4JXNiYf2CZ2prjZ1LvXj6wLakD2YWf/IvZwtljYKPDzkJlG7aMZqwQDfVdXcLhWv 5kx/VnpATB/8caMrGGsFonMpy1FXGkxYCx/KT8Zg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xie XiuQi , Alexander Shishkin , Hongbo Yao , Jiri Olsa , Li Bin , Mark Rutland , Namhyung Kim , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 4.14 128/166] perf util: Fix memory leak of prefix_if_not_in Date: Tue, 29 Sep 2020 13:00:40 +0200 Message-Id: <20200929105941.590892479@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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;