commit 75289eeb81db9a8f85285f2d62b74c506960678c
author Jens Axboe <axboe@fb.com> Mon Jan 05 08:47:01 2015 -0700
committer Mohamad Ayyash <mkayyash@google.com> Fri Mar 06 17:58:12 2015 -0800
tree b110e635e8d6e44a70a6880184ed19d9d02de38d
parent 12585bc837f66f6311431f16ae19cd6d13c300ae

client: fix potential buffer overrun in server name copy

Not an issue right now since pdu.server is larger than the buffer,
but that could change at some point. Better be safe.

Signed-off-by: Jens Axboe <axboe@fb.com>

client.c

diff --git a/client.c b/client.c
index 3cb7c1c..74c9c76 100644
--- a/client.c
+++ b/client.c
@@ -380,6 +380,7 @@
 static void probe_client(struct fio_client *client)
 {
 	struct cmd_client_probe_pdu pdu;
+	const char *sname;
 	uint64_t tag;
 	char buf[64];
 
@@ -391,7 +392,9 @@
 	pdu.flags = 0;
 #endif
 
-	strcpy((char *) pdu.server, server_name(client, buf, sizeof(buf)));
+	sname = server_name(client, buf, sizeof(buf));
+	memset(pdu.server, 0, sizeof(pdu.server));
+	strncpy((char *) pdu.server, sname, sizeof(pdu.server) - 1);
 
 	fio_net_send_cmd(client->fd, FIO_NET_CMD_PROBE, &pdu, sizeof(pdu), &tag, &client->cmd_list);
 }