X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=f11e97278b20f52614269087e37393b2e94b3bf1;hp=38a6bf8543c71fc3f0d48b743c222d4b03a9fea0;hb=bc0fec0e12f19dd424f4bf83cfca89d434184c8d;hpb=b127b679769c7ac84869acb132571ea39acfd459

diff --git a/server.c b/server.c
index 38a6bf85..f11e9727 100644
--- a/server.c
+++ b/server.c
@@ -1523,19 +1523,32 @@ void fio_server_send_job_options(struct flist_head *opt_list,
 
 	flist_for_each(entry, opt_list) {
 		struct print_option *p;
+		size_t len;
 
 		p = flist_entry(entry, struct print_option, list);
 		memset(&pdu, 0, sizeof(pdu));
+
 		if (groupid == -1U) {
 			pdu.global = __cpu_to_le16(1);
 			pdu.groupid = 0;
 		} else {
 			pdu.global = 0;
-			pdu.groupid = __cpu_to_le16(groupid);
+			pdu.groupid = cpu_to_le32(groupid);
+		}
+		len = strlen(p->name);
+		if (len >= sizeof(pdu.name)) {
+			len = sizeof(pdu.name) - 1;
+			pdu.truncated = __cpu_to_le16(1);
+		}
+		memcpy(pdu.name, p->name, len);
+		if (p->value) {
+			len = strlen(p->value);
+			if (len >= sizeof(pdu.value)) {
+				len = sizeof(pdu.value) - 1;
+				pdu.truncated = __cpu_to_le16(1);
+			}
+			memcpy(pdu.value, p->value, len);
 		}
-		memcpy(pdu.name, p->name, strlen(p->name));
-		if (p->value)
-			memcpy(pdu.value, p->value, strlen(p->value));
 		fio_net_queue_cmd(FIO_NET_CMD_JOB_OPT, &pdu, sizeof(pdu), NULL, SK_F_COPY);
 	}
 }