2024-05-10 00:39:26

by Samasth Norway Ananda

Subject: [PATCH RESEND] perf daemon: Fix file leak in daemon_session__control

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 <[email protected]>
---
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

2024-05-10 14:29:19

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH RESEND] perf daemon: Fix file leak in daemon_session__control

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 <[email protected]>

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