From patchwork Wed May 5 12:05:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 431174 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp440980jao; Wed, 5 May 2021 05:09:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxQdi8e43XGlwHjAlTZiO6f8rouSiKn9/m7q0PJNEN+HZUBUdsOd5k3VCRAJoWPph8Fh2X X-Received: by 2002:aa7:d382:: with SMTP id x2mr31234169edq.60.1620216543362; Wed, 05 May 2021 05:09:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620216543; cv=none; d=google.com; s=arc-20160816; b=Bq7JfVI4Otmq0jtDwJi1by6nCI3ZTj5tceQicLrc4UvwsSIpIBjAtkE2sp6mzDgy8W va4TeoaA74drbVH3WwjkXMF98T8jR7hml9fVLSeUKhrtrRMvXvFco4+/C/LEyDVHvmGL 9fW/vsIxakg7tBJVHXVWtWSEBxqzfE3f9FBthxf39PSQh4Z6LGpX8JK4BI0pq180GLHg DiscoBkFv9yxOr6FG7xAHmYX0nSPHoNo9L3/hQvEqbKsj8rXwuMLEJ9mG6f6swJ/jDyd Fva2gSgZLAjpTUQvt9FePWXaBBIhxki2I1QND+0xo1jV3DPtBcPktelSegShTKt+hhbK YdrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zcXVXChQRsyhIsENkxp+RMD94MpPLMsSCos/lD7bbrM=; b=JmlhkmmvGiBK1S7lpV7++e1Sbth5HDMKz1If2gOz9LnTRLfZiJrTnRL8ltz2OzNAKD c6DcZE4UfRSkZfvrC/+4j5l5XR21INx7Y7YMd0YCn63iGW4llDwvqpvyfc7JpFrgUIWb CBUIfCbuur0wE7yPPxOPAsglru6vLHgn/Ggqr/x9o1kNqu8k3G6p+dl6cEbqB8QfyaAd VzUqfhpRqjPjtIHDP/NzjorrL3egcjamCcdobcx8TznyzMuGVIVOxZ/Fl2vk31SOo50w mflGVBs37RW7rZcua5cXJGMUjjl4sQN0V94r0r6hEbUYr5MxLwdO4nEivTRj1aTFl96D 1JlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xRLRSk+l; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u17si5046911ejz.120.2021.05.05.05.09.03; Wed, 05 May 2021 05:09:03 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xRLRSk+l; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232626AbhEEMJp (ORCPT + 12 others); Wed, 5 May 2021 08:09:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:51444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233520AbhEEMIi (ORCPT ); Wed, 5 May 2021 08:08:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 747C9613BC; Wed, 5 May 2021 12:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620216462; bh=xlnvhdu5Oni/7aSVgRMSR2mdTkG5kMknDXPHQUPUELI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xRLRSk+lmyKFGV/5n5wcbk2tZ3XdF+KXOaf6zo6XxElqbYbf8P36h8DAuRZk1SPgt TLq9sA8LhURmsLqdOYynIooeGcWQtgW6GirUPWB0Dm8j6DzVsVV9C0vVjYrZBHL5sm kWQhDuN2J0xjF2lZ6Je7tVcexxJkXMRRWO43KR2U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.10 08/29] perf data: Fix error return code in perf_data__create_dir() Date: Wed, 5 May 2021 14:05:11 +0200 Message-Id: <20210505112326.470107974@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210505112326.195493232@linuxfoundation.org> References: <20210505112326.195493232@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit f2211881e737cade55e0ee07cf6a26d91a35a6fe ] Although 'ret' has been initialized to -1, but it will be reassigned by the "ret = open(...)" statement in the for loop. So that, the value of 'ret' is unknown when asprintf() failed. Reported-by: Hulk Robot Signed-off-by: Zhen Lei Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20210415083417.3740-1-thunder.leizhen@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index c47aa34fdc0a..5d97b3e45fbb 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -35,7 +35,7 @@ void perf_data__close_dir(struct perf_data *data) int perf_data__create_dir(struct perf_data *data, int nr) { struct perf_data_file *files = NULL; - int i, ret = -1; + int i, ret; if (WARN_ON(!data->is_dir)) return -EINVAL; @@ -51,7 +51,8 @@ int perf_data__create_dir(struct perf_data *data, int nr) for (i = 0; i < nr; i++) { struct perf_data_file *file = &files[i]; - if (asprintf(&file->path, "%s/data.%d", data->path, i) < 0) + ret = asprintf(&file->path, "%s/data.%d", data->path, i); + if (ret < 0) goto out_err; ret = open(file->path, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);