proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 17:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Read the UDev vendor and model as a uint16_t

Browse Source
This commit is contained in:
Richard Hughes 2022-06-15 11:58:32 +01:00
parent 7e6b77e12c
commit bf256a7ca7
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libfwupdplugin/fu-udev-device.c
View File

@ -36,10 +36,10 @@
typedef struct { typedef struct {
GUdevDevice *udev_device; GUdevDevice *udev_device;
guint32 vendor; guint16 vendor;
guint32 model; guint16 model;
guint32 subsystem_vendor; guint16 subsystem_vendor;
guint32 subsystem_model; guint16 subsystem_model;
guint8 revision; guint8 revision;
gchar *subsystem; gchar *subsystem;
gchar *bind_id; gchar *bind_id;
@ -87,7 +87,7 @@ fu_udev_device_emit_changed(FuUdevDevice *self)
} }
static guint32 static guint32
fu_udev_device_get_sysfs_attr_as_uint32(GUdevDevice *udev_device, const gchar *name) fu_udev_device_get_sysfs_attr_as_uint16(GUdevDevice *udev_device, const gchar *name)
{ {
#ifdef HAVE_GUDEV #ifdef HAVE_GUDEV
const gchar *tmp; const gchar *tmp;
@ -96,14 +96,14 @@ fu_udev_device_get_sysfs_attr_as_uint32(GUdevDevice *udev_device, const gchar *n
tmp = g_udev_device_get_sysfs_attr(udev_device, name); tmp = g_udev_device_get_sysfs_attr(udev_device, name);
if (tmp == NULL) if (tmp == NULL)
return G_MAXUINT32; return G_MAXUINT16;
if (!fu_strtoull(tmp, &tmp64, 0, G_MAXUINT32, &error_local)) { if (!fu_strtoull(tmp, &tmp64, 0, G_MAXUINT32, &error_local)) {
g_warning("reading %s for %s was invalid: %s", name, tmp, error_local->message); g_warning("reading %s for %s was invalid: %s", name, tmp, error_local->message);
return G_MAXUINT32; return G_MAXUINT16;
} }
return tmp64; return tmp64;
#else #else
return G_MAXUINT32; return G_MAXUINT16;
#endif #endif
} }
@ -340,26 +340,26 @@ fu_udev_device_probe(FuDevice *device, GError **error)
return TRUE; return TRUE;
/* set ven:dev:rev */ /* set ven:dev:rev */
priv->vendor = fu_udev_device_get_sysfs_attr_as_uint32(priv->udev_device, "vendor"); priv->vendor = fu_udev_device_get_sysfs_attr_as_uint16(priv->udev_device, "vendor");
priv->model = fu_udev_device_get_sysfs_attr_as_uint32(priv->udev_device, "device"); priv->model = fu_udev_device_get_sysfs_attr_as_uint16(priv->udev_device, "device");
priv->revision = fu_udev_device_get_sysfs_attr_as_uint8(priv->udev_device, "revision"); priv->revision = fu_udev_device_get_sysfs_attr_as_uint8(priv->udev_device, "revision");
priv->subsystem_vendor = priv->subsystem_vendor =
fu_udev_device_get_sysfs_attr_as_uint32(priv->udev_device, "subsystem_vendor"); fu_udev_device_get_sysfs_attr_as_uint16(priv->udev_device, "subsystem_vendor");
priv->subsystem_model = priv->subsystem_model =
fu_udev_device_get_sysfs_attr_as_uint32(priv->udev_device, "subsystem_device"); fu_udev_device_get_sysfs_attr_as_uint16(priv->udev_device, "subsystem_device");
#ifdef HAVE_GUDEV #ifdef HAVE_GUDEV
/* fallback to the parent */ /* fallback to the parent */
udev_parent = g_udev_device_get_parent(priv->udev_device); udev_parent = g_udev_device_get_parent(priv->udev_device);
if (udev_parent != NULL && priv->flags & FU_UDEV_DEVICE_FLAG_VENDOR_FROM_PARENT && if (udev_parent != NULL && priv->flags & FU_UDEV_DEVICE_FLAG_VENDOR_FROM_PARENT &&
priv->vendor == 0x0 && priv->model == 0x0 && priv->revision == 0x0) { priv->vendor == 0x0 && priv->model == 0x0 && priv->revision == 0x0) {
priv->vendor = fu_udev_device_get_sysfs_attr_as_uint32(udev_parent, "vendor"); priv->vendor = fu_udev_device_get_sysfs_attr_as_uint16(udev_parent, "vendor");
priv->model = fu_udev_device_get_sysfs_attr_as_uint32(udev_parent, "device"); priv->model = fu_udev_device_get_sysfs_attr_as_uint16(udev_parent, "device");
priv->revision = fu_udev_device_get_sysfs_attr_as_uint8(udev_parent, "revision"); priv->revision = fu_udev_device_get_sysfs_attr_as_uint8(udev_parent, "revision");
priv->subsystem_vendor = priv->subsystem_vendor =
fu_udev_device_get_sysfs_attr_as_uint32(udev_parent, "subsystem_vendor"); fu_udev_device_get_sysfs_attr_as_uint16(udev_parent, "subsystem_vendor");
priv->subsystem_model = priv->subsystem_model =
fu_udev_device_get_sysfs_attr_as_uint32(udev_parent, "subsystem_device"); fu_udev_device_get_sysfs_attr_as_uint16(udev_parent, "subsystem_device");
} }
/* hidraw helpfully encodes the information in a different place */ /* hidraw helpfully encodes the information in a different place */
@ -370,7 +370,7 @@ fu_udev_device_probe(FuDevice *device, GError **error)
g_auto(GStrv) split = g_strsplit(tmp, ":", -1); g_auto(GStrv) split = g_strsplit(tmp, ":", -1);
if (g_strv_length(split) == 3) { if (g_strv_length(split) == 3) {
guint64 val = g_ascii_strtoull(split[1], NULL, 16); guint64 val = g_ascii_strtoull(split[1], NULL, 16);
if (val > G_MAXUINT32) { if (val > G_MAXUINT16) {
g_warning("reading %s for %s overflowed", g_warning("reading %s for %s overflowed",
split[1], split[1],
g_udev_device_get_sysfs_path(priv->udev_device)); g_udev_device_get_sysfs_path(priv->udev_device));