Received-SPF: pass (google.com: domain of linux-kernel+bounces-175903-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 10 May 2024 11:28:58 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Samasth Norway Ananda <samasth.norway.ananda@oracle.com>
Cc: namhyung@kernel.org, peterz@infradead.org, mingo@redhat.com,
	mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
	jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com,
	linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH RESEND] perf daemon: Fix file leak in
 daemon_session__control
Message-ID: <Zj4vKps94GwVBwQ5@x1>
References: <20240510003424.2016914-1-samasth.norway.ananda@oracle.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240510003424.2016914-1-samasth.norway.ananda@oracle.com>

On Thu, May 09, 2024 at 05:34:24PM -0700, Samasth Norway Ananda wrote:
> The open() function returns -1 on error.
> 'control' and 'ack' both initialized with open() and further
> validated with 'if' statement. 'if (!control)' would evaluate
> to 'true' if returned value on error were '0' but it is actually '-1'.
> 
> Fixes: edcaa47958c7 ("perf daemon: Add 'ping' command")
> Signed-off-by: Samasth Norway Ananda <samasth.norway.ananda@oracle.com>

Thanks, applied to perf-tools-next,

- Arnaldo

> ---
> Found this error through static analysis. This has only been compile
> tested.
> ---
>  tools/perf/builtin-daemon.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
> index 83954af36753..de76bbc50bfb 100644
> --- a/tools/perf/builtin-daemon.c
> +++ b/tools/perf/builtin-daemon.c
> @@ -523,7 +523,7 @@ static int daemon_session__control(struct daemon_session *session,
>  		  session->base, SESSION_CONTROL);
>  
>  	control = open(control_path, O_WRONLY|O_NONBLOCK);
> -	if (!control)
> +	if (control < 0)
>  		return -1;
>  
>  	if (do_ack) {
> @@ -532,7 +532,7 @@ static int daemon_session__control(struct daemon_session *session,
>  			  session->base, SESSION_ACK);
>  
>  		ack = open(ack_path, O_RDONLY, O_NONBLOCK);
> -		if (!ack) {
> +		if (ack < 0) {
>  			close(control);
>  			return -1;
>  		}
> -- 
> 2.42.0