client: fix potential buffer overrun in socket path

[fio.git] / client.c

diff --git a/client.c b/client.c
index 467d093982c8ff1f6fdd2cb7d6781e8c76934c8b..af6621dc63d3e0ce7c196e1bd5daa0e747463a7d 100644 (file)
--- a/client.c
+++ b/client.c
@@ -388,7 +388,7 @@ static int fio_client_connect_sock(struct fio_client *client)
 
        memset(addr, 0, sizeof(*addr));
        addr->sun_family = AF_UNIX;
-       strcpy(addr->sun_path, client->hostname);
+       strncpy(addr->sun_path, client->hostname, sizeof(addr->sun_path) - 1);
 
        fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (fd < 0) {
@@ -907,15 +907,15 @@ static void convert_dus(struct disk_util_stat *dus)
        int i;
 
        for (i = 0; i < 2; i++) {
-               dus->ios[i]     = le32_to_cpu(dus->ios[i]);
-               dus->merges[i]  = le32_to_cpu(dus->merges[i]);
-               dus->sectors[i] = le64_to_cpu(dus->sectors[i]);
-               dus->ticks[i]   = le32_to_cpu(dus->ticks[i]);
+               dus->s.ios[i]           = le32_to_cpu(dus->s.ios[i]);
+               dus->s.merges[i]        = le32_to_cpu(dus->s.merges[i]);
+               dus->s.sectors[i]       = le64_to_cpu(dus->s.sectors[i]);
+               dus->s.ticks[i]         = le32_to_cpu(dus->s.ticks[i]);
        }
 
-       dus->io_ticks           = le32_to_cpu(dus->io_ticks);
-       dus->time_in_queue      = le32_to_cpu(dus->time_in_queue);
-       dus->msec               = le64_to_cpu(dus->msec);
+       dus->s.io_ticks         = le32_to_cpu(dus->s.io_ticks);
+       dus->s.time_in_queue    = le32_to_cpu(dus->s.time_in_queue);
+       dus->s.msec             = le64_to_cpu(dus->s.msec);
 }
 
 static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)