about summary refs log tree commit diff
path: root/qemu_mode/patches
diff options
context:
space:
mode:
authorhexcoder- <heiko@hexco.de>2020-03-28 14:15:04 +0100
committerDominik Maier <domenukk@gmail.com>2020-04-01 13:10:06 +0200
commit7698c051aab5f76d4db1f436dbc52c6f64ada216 (patch)
treecf8c9015b3b4ada92cad9ad40efedbd0503cca6e /qemu_mode/patches
parent1950f09bde8d4bd708299afad094afd91f6dc242 (diff)
downloadafl++-7698c051aab5f76d4db1f436dbc52c6f64ada216.tar.gz
qemu_mode: compiler warnings, strncpy() leave one byte for terminator
Diffstat (limited to 'qemu_mode/patches')
-rw-r--r--qemu_mode/patches/make_strncpy_safe.diff31
1 files changed, 31 insertions, 0 deletions
diff --git a/qemu_mode/patches/make_strncpy_safe.diff b/qemu_mode/patches/make_strncpy_safe.diff
new file mode 100644
index 00000000..38c7d248
--- /dev/null
+++ b/qemu_mode/patches/make_strncpy_safe.diff
@@ -0,0 +1,31 @@
+--- a/util/qemu-sockets.c	2020-03-28 13:55:09.511029429 +0100
++++ b/util/qemu-sockets.c	2020-03-28 14:01:12.147693937 +0100
+@@ -877,7 +877,7 @@
+ 
+     memset(&un, 0, sizeof(un));
+     un.sun_family = AF_UNIX;
+-    strncpy(un.sun_path, path, sizeof(un.sun_path));
++    strncpy(un.sun_path, path, sizeof(un.sun_path) - 1);
+ 
+     if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) {
+         error_setg_errno(errp, errno, "Failed to bind socket to %s", path);
+@@ -922,7 +922,7 @@
+ 
+     memset(&un, 0, sizeof(un));
+     un.sun_family = AF_UNIX;
+-    strncpy(un.sun_path, saddr->path, sizeof(un.sun_path));
++    strncpy(un.sun_path, saddr->path, sizeof(un.sun_path) - 1);
+ 
+     /* connect to peer */
+     do {
+--- a/block/sheepdog.c	2020-03-28 14:01:57.164360270 +0100
++++ b/block/sheepdog.c	2020-03-28 14:02:52.781026597 +0100
+@@ -1236,7 +1236,7 @@
+      * don't want the send_req to read uninitialized data.
+      */
+     strncpy(buf, filename, SD_MAX_VDI_LEN);
+-    strncpy(buf + SD_MAX_VDI_LEN, tag, SD_MAX_VDI_TAG_LEN);
++    strncpy(buf + SD_MAX_VDI_LEN, tag, SD_MAX_VDI_TAG_LEN - 1);
+ 
+     memset(&hdr, 0, sizeof(hdr));
+     if (lock) {