From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751810AbdAWXcw (ORCPT <rfc822;w@1wt.eu>);
        Mon, 23 Jan 2017 18:32:52 -0500
Received: from mail.kernel.org ([198.145.29.136]:51850 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750907AbdAWXcv (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 23 Jan 2017 18:32:51 -0500
Date: Tue, 24 Jan 2017 08:32:37 +0900
From: Masami Hiramatsu <mhiramat@kernel.org>
To: SF Markus Elfring <elfring@users.sourceforge.net>
Cc: Adrian Hunter <adrian.hunter@intel.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        He Kuang <hekuang@huawei.com>, Ingo Molnar <mingo@redhat.com>,
        Jiri Olsa <jolsa@kernel.org>, Milian Wolff <milian.wolff@kdab.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>,
        Wang Nan <wangnan0@huawei.com>, LKML <linux-kernel@vger.kernel.org>,
        kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 4/4] perf strlist: Move an error code assignment in
 strlist__parse_list_entry()
Message-Id: <20170124083237.690a8a01be2be6b1b1a19c95@kernel.org>
In-Reply-To: <2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net>
References: <c8eebdee-ad45-c2a8-9a4d-e1032ec9a17f@users.sourceforge.net>
        <2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net>
X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.30; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 23 Jan 2017 16:26:24 +0100
SF Markus Elfring <elfring@users.sourceforge.net> wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 23 Jan 2017 15:56:31 +0100
> 
> A local variable was set to an error code before a concrete error situation
> was detected. Thus move the corresponding assignment into an if branch
> to indicate a software failure there.
> 
> This issue was detected by using the Coccinelle software.

Looks good to me.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks!

> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  tools/perf/util/strlist.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
> index 0d3dfcb919b4..a934be385a6d 100644
> --- a/tools/perf/util/strlist.c
> +++ b/tools/perf/util/strlist.c
> @@ -118,9 +118,10 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s,
>  		return strlist__load(slist, s + 7);
>  
>  	if (subst_dir) {
> -		err = -ENOMEM;
> -		if (asprintf(&subst, "%s/%s", subst_dir, s) < 0)
> +		if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) {
> +			err = -ENOMEM;
>  			goto out;
> +		}
>  
>  		if (access(subst, F_OK) == 0) {
>  			err = strlist__load(slist, subst);
> -- 
> 2.11.0
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>