[PATCH V1 5/5] node_device: fix possible non-terminated string

[Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>]

Error: STRING_NULL:
/libvirt/src/node_device/node_device_linux_sysfs.c:80:
string_null_argument: Function "saferead" does not terminate string "*buf".
/libvirt/src/util/util.c:101:
string_null_argument: Function "read" fills array "*buf" with a non-terminated string.
/libvirt/src/node_device/node_device_linux_sysfs.c:87:
string_null: Passing unterminated string "buf" to a function expecting a null-terminated string.

---
 src/node_device/node_device_linux_sysfs.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Index: libvirt-acl/src/node_device/node_device_linux_sysfs.c
===================================================================
--- libvirt-acl.orig/src/node_device/node_device_linux_sysfs.c
+++ libvirt-acl/src/node_device/node_device_linux_sysfs.c
@@ -69,20 +69,21 @@ out:
 int read_wwn_linux(int host, const char *file, char **wwn)
 {
     char *p = NULL;
-    int fd = -1, retval = 0;
-    char buf[64];
+    int fd = -1, retval = 0, len;
+    char buf[65];
 
     if (open_wwn_file(LINUX_SYSFS_FC_HOST_PREFIX, host, file, &fd) < 0) {
         goto out;
     }
 
-    memset(buf, 0, sizeof(buf));
-    if (saferead(fd, buf, sizeof(buf)) < 0) {
+    len = saferead(fd, buf, sizeof(buf) - 1);
+    if (len < 0) {
         retval = -1;
         VIR_DEBUG("Failed to read WWN for host%d '%s'",
                   host, file);
         goto out;
     }
+    buf[len] = '\0';
 
     p = strstr(buf, "0x");
     if (p != NULL) {

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list