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 v2 7/7] util: Check return value of lseek() while reading bound ports from procfs
Date: Fri, 07 Oct 2022 13:51:06 +0200	[thread overview]
Message-ID: <20221007115106.1983846-8-sbrivio@redhat.com> (raw)
In-Reply-To: <20221007115106.1983846-1-sbrivio@redhat.com>

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

Coverity now noticed we're checking most lseek() return values, but
not this. Not really relevant, but it doesn't hurt to check we can
actually seek before reading lines.

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
Reviewed-by: David Gibson <david(a)gibson.dropbear.id.au>
---
 util.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/util.c b/util.c
index b366167..5b1e08a 100644
--- a/util.c
+++ b/util.c
@@ -311,10 +311,14 @@ void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns,
 			path = "/proc/net/udp6";
 	}
 
-	if (*fd != -1)
-		lseek(*fd, 0, SEEK_SET);
-	else if ((*fd = open(path, O_RDONLY | O_CLOEXEC)) < 0)
+	if (*fd != -1) {
+		if (lseek(*fd, 0, SEEK_SET)) {
+			warn("lseek() failed on %s: %s", path, strerror(errno));
+			return;
+		}
+	} else if ((*fd = open(path, O_RDONLY | O_CLOEXEC)) < 0) {
 		return;
+	}
 
 	lineread_init(&lr, *fd);
 	lineread_get(&lr, &line); /* throw away header */
-- 
@@ -311,10 +311,14 @@ void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns,
 			path = "/proc/net/udp6";
 	}
 
-	if (*fd != -1)
-		lseek(*fd, 0, SEEK_SET);
-	else if ((*fd = open(path, O_RDONLY | O_CLOEXEC)) < 0)
+	if (*fd != -1) {
+		if (lseek(*fd, 0, SEEK_SET)) {
+			warn("lseek() failed on %s: %s", path, strerror(errno));
+			return;
+		}
+	} else if ((*fd = open(path, O_RDONLY | O_CLOEXEC)) < 0) {
 		return;
+	}
 
 	lineread_init(&lr, *fd);
 	lineread_get(&lr, &line); /* throw away header */
-- 
2.35.1


      parent reply	other threads:[~2022-10-07 11:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-07 11:50 [PATCH v2 0/7] Add support for log file and version display Stefano Brivio
2022-10-07 11:51 ` [PATCH v2 1/7] Move logging functions to a new file, log.c Stefano Brivio
2022-10-07 11:51 ` [PATCH v2 2/7] conf: Drop duplicate, diverging optstring assignments Stefano Brivio
2022-10-07 11:51 ` [PATCH v2 3/7] passt.h: Include netinet/if_ether.h before struct ctx declaration Stefano Brivio
2022-10-07 11:51 ` [PATCH v2 4/7] log, conf: Add support for logging to file Stefano Brivio
2022-10-07 11:51 ` [PATCH v2 5/7] log: Add missing function comment for trace_init() Stefano Brivio
2022-10-07 11:51 ` [PATCH v2 6/7] conf, log, Makefile: Add versioning information Stefano Brivio
2022-10-07 11:51 ` Stefano Brivio [this message]

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=20221007115106.1983846-8-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).