External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unsafe strncpy from esx_vmx.c

Browse Source 
While trying to remove uses of unsafe strncpy in the tree, I came
across a couple of usages in the ESX driver.  To my eyes, the snprintf
replacements do the same thing in less code, and are also safer.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
Tested-by: Mattias Bolte <matthias.bolte@googlemail.com>
This commit is contained in:
Chris Lalancette 2009-08-03 13:39:07 +02:00
parent 7534be6fbc
commit 47919e46ab
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/esx/esx_vmx.c
View File

@ -396,12 +396,7 @@ def->parallels[0]...
#define ESX_BUILD_VMX_NAME(_suffix) \
do { \
strncpy(_suffix##_name, prefix, sizeof (_suffix##_name) - 1); \
_suffix##_name[sizeof (_suffix##_name) - 1] = '\0'; \
strncat(_suffix##_name, "."#_suffix, \
sizeof (_suffix##_name) - 1 - strlen(_suffix##_name)); \
} while (0)
snprintf(_suffix##_name, sizeof(_suffix##_name), "%s."#_suffix, prefix);
@ -839,11 +834,9 @@ esxVMX_ParseSCSIController(virConnectPtr conn, virConfPtr conf, int controller,
goto failure;
}
strncpy(present_name, "scsiX.present", sizeof (virtualDev_name));
strncpy(virtualDev_name, "scsiX.virtualDev", sizeof (virtualDev_name));
present_name[4] = '0' + controller;
virtualDev_name[4] = '0' + controller;
snprintf(present_name, sizeof(present_name), "scsi%d.present", controller);
snprintf(virtualDev_name, sizeof(virtualDev_name), "scsi%d.virtualDev",
controller);
if (esxUtil_GetConfigBoolean(conn, conf, present_name, present, 0, 1) < 0) {
goto failure;
@ -1333,8 +1326,7 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller,
goto failure;
}
strncpy(prefix, "ethernetX", sizeof (prefix));
prefix[8] = '0' + controller;
snprintf(prefix, sizeof(prefix), "ethernet%d", controller);
ESX_BUILD_VMX_NAME(present);
ESX_BUILD_VMX_NAME(startConnected);
@ -1514,8 +1506,7 @@ esxVMX_ParseSerial(virConnectPtr conn, virConfPtr conf, int port,
goto failure;
}
strncpy(prefix, "serialX", sizeof (prefix));
prefix[6] = '0' + port;
snprintf(prefix, sizeof(prefix), "serial%d", port);
ESX_BUILD_VMX_NAME(present);
ESX_BUILD_VMX_NAME(startConnected);
@ -1627,8 +1618,7 @@ esxVMX_ParseParallel(virConnectPtr conn, virConfPtr conf, int port,
goto failure;
}
strncpy(prefix, "parallelX", sizeof (prefix));
prefix[8] = '0' + port;
snprintf(prefix, sizeof(prefix), "parallel%d", port);
ESX_BUILD_VMX_NAME(present);
ESX_BUILD_VMX_NAME(startConnected);