From patchwork Wed May 5 12:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 431167 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp438082jao; Wed, 5 May 2021 05:05:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2rcjWPnZIjGqzJOlmcB/CsVzy2FGKHnYXTsluE8B/JlR0oxTYJtOhkla1neIug5S7XMXr X-Received: by 2002:a05:6402:35c4:: with SMTP id z4mr15592943edc.362.1620216331733; Wed, 05 May 2021 05:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620216331; cv=none; d=google.com; s=arc-20160816; b=O9M6sbKi+Znh26GWpbCg33dWSdoeu8YZDgF0x0BVzp1gY8AuTk6Awhb0nPamWl/P3h P5OJD/w7j2lt2TkM6JtUerid//nEiogPwZ3+1H8dnPD0CwKMPb9xvVTiTGkgNsFGh6Iy cuaqpZjuKvYYAoOybRppOFv/l2fYHRzAX4aLDFUL0beKGEfgUkjJ+/4FxY6anzl12vcP NQgUrhi+nxuRjisyN0vEYyj6NotuuwDMG3jtZ/KHlOvFR+EplBQIf6/FBaqcp70G4Wpm bHjGoShclTMqLJDY9H+IrXhZP+HPJauzKMpzHF+auNpd5Z8eMqCW8xgoCX2TLJ1x5Pbz IROg== 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=if6gyXhg74BVw8WacEvzmnBvhPkyjVkP8FhCCkqoq8A=; b=Bha/VUpXsoayc07ZnK9gopzOLn2vjIqI4sWjnDv3RrkmzWlti6vUfDBG+PkCWdRCXc Ycu+DQYqiMXyJ5LUTIsZl/6YwZue5lSCs+oIE9JfgpkR+McDedHBYJGjmfFlG0CO9uKA rf6RYrSe1jFnXFMO1OYKlz9nCOX5qze1kJO6d5WPHMKCuh7ICbw/VmBatVrSiG952/jI gkweBEYHpMvWjuHpnl133hDW2FST05ydngffrf8BIJqiQ1OaC/ubUDWsamvyJo+idzAC hOW1U+0VNDtJTQi1L/Vj/Ig3p5URlWWkIqJmTvOE+YPj+x8LskZ96kBoiNJTn/LYRfx6 1l2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FP0tBrIL; 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 e18si5133798ejb.261.2021.05.05.05.05.31; Wed, 05 May 2021 05:05:31 -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=FP0tBrIL; 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 S233236AbhEEMGV (ORCPT + 12 others); Wed, 5 May 2021 08:06:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:44066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233250AbhEEMGM (ORCPT ); Wed, 5 May 2021 08:06:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8E0B0611EE; Wed, 5 May 2021 12:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620216316; bh=MRevBN2xh5xxjB2iqX4P6X5KJEVH66ROP2JYUgDKy6Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FP0tBrIL9hses5kawoDDkPTLdFWvloLLy5oCFlH3Zs8ta+A8CSTUvY2Q/alcxugbw iI+UnuMmrbobkKchwH5+tvXJIgEex6LyD5VdQ2KEiqwg8YIRdruPCnaGPHYAWWOkoa r+hjOz/8jKxy7ZhSKNAT4Zmvs0hiwzLnYPG9CMCA= 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.4 11/21] perf data: Fix error return code in perf_data__create_dir() Date: Wed, 5 May 2021 14:04:25 +0200 Message-Id: <20210505112325.095603347@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210505112324.729798712@linuxfoundation.org> References: <20210505112324.729798712@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 88fba2ba549f..7534455ffc6a 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);