diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2019-10-04 17:30:21 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-10-15 10:45:30 +0000 |
| commit | a086e304e4061569c0cb1cfb20a5c045c0e92c16 (patch) | |
| tree | f8223721c3dade59aed90bbf8114b4bf141c2547 /src | |
| parent | b022d3195a5a3f30c6a5b48af9bf00a0fcdcf976 (diff) | |
vlib: pci: set pci driver name to none when no driver is loaded
If no Linux PCI driver module is loaded, then the driver_name in the PCI
info struct is NULL. This can triggers crash when checking driver name
eg. in vlib_pci_device_open().
Default to "<NONE>" as driver name, which should never match.
Type: fix
Change-Id: I9e69889a7566467bd8220b92bbbaa72ada957257
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 0eae2bb1f1199f7dcb6a8c62b1ea612ed9ee4ae1)
Diffstat (limited to 'src')
| -rw-r--r-- | src/vlib/linux/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c index fdb5271f56a..82f5007818e 100644 --- a/src/vlib/linux/pci.c +++ b/src/vlib/linux/pci.c @@ -291,6 +291,8 @@ vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr, vec_reset_length (f); f = format (f, "%v/driver%c", dev_dir_name, 0); di->driver_name = clib_sysfs_link_to_name ((char *) f); + if (!di->driver_name) + di->driver_name = format (0, "<NONE>%c", 0); di->iommu_group = -1; if (lvm->container_fd != -1) |