External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

interface: fix udev_device_get_sysattr_value return value check

Browse Source 
Reviewing the code I found that return value of function
udev_device_get_sysattr_value() is dereferenced without a check.
udev_device_get_sysattr_value() may return NULL by number of reasons.

v2: VIR_DEBUG added, replaced STREQ(NULLSTR()) with STREQ_NULLABLE()
v3: More checks added, to skip earlier. More verbose VIR_DEBUG.

Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Dmitry Frolov 2023-09-12 15:56:47 +03:00 committed by Martin Kletzander
parent 9783b2b3e5
commit 2ca94317ac
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/interface/interface_backend_udev.c
View File

@ -23,6 +23,7 @@
#include <dirent.h> #include <dirent.h>
#include <libudev.h> #include <libudev.h>
#include "virlog.h"
#include "virerror.h" #include "virerror.h"
#include "virfile.h" #include "virfile.h"
#include "datatypes.h" #include "datatypes.h"
@ -40,6 +41,8 @@
#define VIR_FROM_THIS VIR_FROM_INTERFACE #define VIR_FROM_THIS VIR_FROM_INTERFACE
VIR_LOG_INIT("interface.interface_backend_udev");
struct udev_iface_driver { struct udev_iface_driver {
struct udev *udev; struct udev *udev;
/* pid file FD, ensures two copies of the driver can't use the same root */ /* pid file FD, ensures two copies of the driver can't use the same root */
@ -354,11 +357,20 @@ udevConnectListAllInterfaces(virConnectPtr conn,
const char *macaddr; const char *macaddr;
g_autoptr(virInterfaceDef) def = NULL; g_autoptr(virInterfaceDef) def = NULL;
path = udev_list_entry_get_name(dev_entry); if (!(path = udev_list_entry_get_name(dev_entry))) {
dev = udev_device_new_from_syspath(udev, path); VIR_DEBUG("Skipping interface, path == NULL");
name = udev_device_get_sysname(dev); continue;
}
if (!(dev = udev_device_new_from_syspath(udev, path))) {
VIR_DEBUG("Skipping interface '%s', dev == NULL", path);
continue;
}
if (!(name = udev_device_get_sysname(dev))) {
VIR_DEBUG("Skipping interface '%s', name == NULL", path);
continue;
}
macaddr = udev_device_get_sysattr_value(dev, "address"); macaddr = udev_device_get_sysattr_value(dev, "address");
status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
def = udevGetMinimalDefForDevice(dev); def = udevGetMinimalDefForDevice(dev);
if (!virConnectListAllInterfacesCheckACL(conn, def)) { if (!virConnectListAllInterfacesCheckACL(conn, def)) {
@ -964,9 +976,9 @@ udevGetIfaceDef(struct udev *udev, const char *name)
/* MTU */ /* MTU */
mtu_str = udev_device_get_sysattr_value(dev, "mtu"); mtu_str = udev_device_get_sysattr_value(dev, "mtu");
if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not parse MTU value '%1$s'"), mtu_str); _("Could not parse MTU value '%1$s'"), NULLSTR(mtu_str));
goto error; goto error;
} }
ifacedef->mtu = mtu; ifacedef->mtu = mtu;
@ -1089,7 +1101,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo)
goto cleanup; goto cleanup;
/* Check if it's active or not */ /* Check if it's active or not */
status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
udev_device_unref(dev); udev_device_unref(dev);