public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH 3/7] tap: Check return value of accept4() before calling getsockopt()
Date: Wed, 21 Sep 2022 22:55:03 +0200	[thread overview]
Message-ID: <20220921205507.2742203-4-sbrivio@redhat.com> (raw)
In-Reply-To: <20220921205507.2742203-1-sbrivio@redhat.com>

[-- Attachment #1: Type: text/plain, Size: 950 bytes --]

Reported by Coverity (CWE-119):

	Negative value used as argument to a function expecting a
	positive value (for example, size of buffer or allocation)

and harmless, because getsockopt() would return -EBADF if the
socket is -1, so we wouldn't print anything.

Check if accept4() returns a valid socket before calling getsockopt()
on it.

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
 tap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tap.c b/tap.c
index 3231da7..4d7422f 100644
--- a/tap.c
+++ b/tap.c
@@ -872,11 +872,13 @@ static void tap_sock_unix_new(struct ctx *c)
 		int discard = accept4(c->fd_tap_listen, NULL, NULL,
 				      SOCK_NONBLOCK);
 
+		if (discard == -1)
+			return;
+
 		if (!getsockopt(discard, SOL_SOCKET, SO_PEERCRED, &ucred, &len))
 			info("discarding connection from PID %i", ucred.pid);
 
-		if (discard != -1)
-			close(discard);
+		close(discard);
 
 		return;
 	}
-- 
@@ -872,11 +872,13 @@ static void tap_sock_unix_new(struct ctx *c)
 		int discard = accept4(c->fd_tap_listen, NULL, NULL,
 				      SOCK_NONBLOCK);
 
+		if (discard == -1)
+			return;
+
 		if (!getsockopt(discard, SOL_SOCKET, SO_PEERCRED, &ucred, &len))
 			info("discarding connection from PID %i", ucred.pid);
 
-		if (discard != -1)
-			close(discard);
+		close(discard);
 
 		return;
 	}
-- 
2.35.1


  parent reply	other threads:[~2022-09-21 20:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-21 20:55 [PATCH 0/7] Fixes and workarounds for tests, Coverity warnings Stefano Brivio
2022-09-21 20:55 ` [PATCH 1/7] test/perf: Always use /sbin/sysctl in tcp test Stefano Brivio
2022-09-22  6:28   ` David Gibson
2022-09-21 20:55 ` [PATCH 2/7] test/perf: Switch performance test duration to 10 seconds instead of 30 Stefano Brivio
2022-09-22  6:29   ` David Gibson
2022-09-21 20:55 ` Stefano Brivio [this message]
2022-09-22  6:30   ` [PATCH 3/7] tap: Check return value of accept4() before calling getsockopt() David Gibson
2022-09-21 20:55 ` [PATCH 4/7] conf, tcp, udp: Arrays for ports need 2^16 values, not 2^16-8 Stefano Brivio
2022-09-22  6:43   ` David Gibson
2022-09-22  8:21     ` Stefano Brivio
2022-09-22 23:39       ` Stefano Brivio
2022-09-23  2:09         ` David Gibson
2022-09-21 20:55 ` [PATCH 5/7] test/lib: Restore IFS while executing directives in def blocks Stefano Brivio
2022-09-22  6:44   ` David Gibson
2022-09-22  8:25     ` Stefano Brivio
2022-09-23  6:55       ` David Gibson
2022-09-21 20:55 ` [PATCH 6/7] test/lib: Wait on iperf3 clients to be done, then send SIGINT to servers Stefano Brivio
2022-09-21 20:55 ` [PATCH 7/7] test/perf: Disable periodic throughput reports to avoid vhost hang Stefano Brivio
2022-09-22  6:46   ` David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220921205507.2742203-4-sbrivio@redhat.com \
    --to=sbrivio@redhat.com \
    --cc=passt-dev@passt.top \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).