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

Ensure that firmware provides are legal GUIDs

Browse Source 
If they are raw device strings, e.g. 'USB\VID_046D&PID_AAAC' just fix them
in-place.
This commit is contained in:
Richard Hughes 2017-06-08 14:26:31 +01:00
parent 871618ae1b
commit 3d2fc1e353
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fu-main.c
View File

@ -776,6 +776,30 @@ fu_main_get_guids_from_store (AsStore *store)
return g_string_free (str, FALSE); return g_string_free (str, FALSE);
} }
static void
fu_main_vendor_fixup_provide_value (AsApp *app)
{
GPtrArray *provides;
/* no quirk required */
if (as_app_get_kind (app) != AS_APP_KIND_FIRMWARE)
return;
/* fix each provide to be a GUID */
provides = as_app_get_provides (app);
for (guint i = 0; i < provides->len; i++) {
AsProvide *prov = g_ptr_array_index (provides, i);
const gchar *value = as_provide_get_value (prov);
g_autofree gchar *guid = NULL;
if (as_provide_get_kind (prov) != AS_PROVIDE_KIND_FIRMWARE_FLASHED)
continue;
if (as_utils_guid_is_valid (value))
continue;
guid = as_utils_guid_from_string (value);
as_provide_set_value (prov, guid);
}
}
static void static void
fu_main_vendor_quirk_release_version (AsApp *app) fu_main_vendor_quirk_release_version (AsApp *app)
{ {
@ -1018,6 +1042,9 @@ fu_main_update_helper_for_device (FuMainAuthHelper *helper,
/* possibly convert the version from 0x to dotted */ /* possibly convert the version from 0x to dotted */
fu_main_vendor_quirk_release_version (app); fu_main_vendor_quirk_release_version (app);
/* possibly convert the flashed provide to a GUID */
fu_main_vendor_fixup_provide_value (app);
version = as_release_get_version (rel); version = as_release_get_version (rel);
fu_device_set_update_version (device, version); fu_device_set_update_version (device, version);
@ -1472,6 +1499,9 @@ fu_main_get_updates_item_update (FuMainPrivate *priv, FuDeviceItem *item)
/* possibly convert the version from 0x to dotted */ /* possibly convert the version from 0x to dotted */
fu_main_vendor_quirk_release_version (app); fu_main_vendor_quirk_release_version (app);
/* possibly convert the flashed provide to a GUID */
fu_main_vendor_fixup_provide_value (app);
/* get latest release */ /* get latest release */
release = as_app_get_release_default (app); release = as_app_get_release_default (app);
if (release == NULL) { if (release == NULL) {
@ -1737,6 +1767,9 @@ fu_main_get_result_from_app (FuMainPrivate *priv, AsApp *app, GError **error)
/* possibly convert the version from 0x to dotted */ /* possibly convert the version from 0x to dotted */
fu_main_vendor_quirk_release_version (app); fu_main_vendor_quirk_release_version (app);
/* possibly convert the flashed provide to a GUID */
fu_main_vendor_fixup_provide_value (app);
/* create a result with all the metadata in */ /* create a result with all the metadata in */
fwupd_device_set_description (dev, as_app_get_description (app, NULL)); fwupd_device_set_description (dev, as_app_get_description (app, NULL));
rel = fwupd_result_get_release (res); rel = fwupd_result_get_release (res);