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

pci: initialize virtual_functions array pointer to avoid segfault

Browse Source 
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=971325

The problem was that if virPCIGetVirtualFunctions was given the name
of a non-existent interface, it would return to its caller without
initializing the pointer to the array of virtual functions to NULL,
and the caller (virNetDevGetVirtualFunctions) would try to VIR_FREE()
the invalid pointer.

The final error message before the crash would be:

 virPCIGetVirtualFunctions:2088 :
  Failed to open dir '/sys/class/net/eth2/device':
  No such file or directory

In this patch I move the initialization in virPCIGetVirtualFunctions()
to the begining of the function, and also do an explicit
initialization in virNetDevGetVirtualFunctions, just in case someone
in the future adds code into that function prior to the call to
virPCIGetVirtualFunctions.
This commit is contained in:
Laine Stump 2013-06-30 23:52:43 -04:00
parent 374c5e4f73
commit 2c2525ab6a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/virnetdev.c
View File

@ -1100,6 +1100,9 @@ virNetDevGetVirtualFunctions(const char *pfname,
char *pci_sysfs_device_link = NULL; char *pci_sysfs_device_link = NULL;
char *pciConfigAddr = NULL; char *pciConfigAddr = NULL;
*virt_fns = NULL;
*n_vfname = 0;
if (virNetDevSysfsFile(&pf_sysfs_device_link, pfname, "device") < 0) if (virNetDevSysfsFile(&pf_sysfs_device_link, pfname, "device") < 0)
return ret; return ret;

5
src/util/virpci.c
View File

@ -2425,6 +2425,9 @@ virPCIGetVirtualFunctions(const char *sysfs_path,
VIR_DEBUG("Attempting to get SR IOV virtual functions for device" VIR_DEBUG("Attempting to get SR IOV virtual functions for device"
"with sysfs path '%s'", sysfs_path); "with sysfs path '%s'", sysfs_path);
*virtual_functions = NULL;
*num_virtual_functions = 0;
dir = opendir(sysfs_path); dir = opendir(sysfs_path);
if (dir == NULL) { if (dir == NULL) {
memset(errbuf, '\0', sizeof(errbuf)); memset(errbuf, '\0', sizeof(errbuf));
@ -2434,8 +2437,6 @@ virPCIGetVirtualFunctions(const char *sysfs_path,
return ret; return ret;
} }
*virtual_functions = NULL;
*num_virtual_functions = 0;
while ((entry = readdir(dir))) { while ((entry = readdir(dir))) {
if (STRPREFIX(entry->d_name, "virtfn")) { if (STRPREFIX(entry->d_name, "virtfn")) {
virPCIDeviceAddress *config_addr = NULL; virPCIDeviceAddress *config_addr = NULL;