From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 26 Aug 2018 15:38:28 +0000 (-0700)
Subject: iolog: Ensure that sockaddr_un.sun_path is '\0'-terminated
X-Git-Tag: fio-3.10~4^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c7d23f4bd20fcb255619508210ed91f185f0ff6f;p=fio.git

iolog: Ensure that sockaddr_un.sun_path is '\0'-terminated

This patch fixes Coverity ID 183494.

Fixes: 2f8f4821ef61 ("iolog: allow to read_iolog from unix socket")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---

diff --git a/iolog.c b/iolog.c
index f3eedb56..26c34586 100644
--- a/iolog.c
+++ b/iolog.c
@@ -580,7 +580,10 @@ static int open_socket(const char *path)
 	if (fd < 0)
 		return fd;
 	addr.sun_family = AF_UNIX;
-	strncpy(addr.sun_path, path, sizeof(addr.sun_path));
+	if (snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path) >=
+	    sizeof(addr.sun_path))
+		log_err("%s: path name %s is too long for a Unix socket\n",
+			__func__, path);
 	if (connect(fd, (const struct sockaddr *)&addr, strlen(path) + sizeof(addr.sun_family)) == 0)
 		return fd;
 	else