From 988e73c414e866483dd07fc8aeb37bf65aab9e44 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Sat, 19 May 2018 20:05:53 +0100
Subject: [PATCH] uefi: Search all available GUIDs when matching hardware

Using just the default GUID is fragile and might break if the GUIDs get added
in the 'wrong' order or if the GUID list is sorted.

Fixes https://github.com/hughsie/fwupd/issues/518
---
 plugins/uefi/fu-plugin-uefi.c | 31 ++++++++++++++-----------------
 src/fu-device.c               | 21 +++++++++++++++++++++
 src/fu-device.h               |  1 +
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c
index bcc3bc916..64d49efc0 100644
--- a/plugins/uefi/fu-plugin-uefi.c
+++ b/plugins/uefi/fu-plugin-uefi.c
@@ -84,11 +84,12 @@ fu_plugin_uefi_guid_to_string (efi_guid_t *guid_raw)
 }
 
 static fwup_resource *
-fu_plugin_uefi_find (fwup_resource_iter *iter, const gchar *guid_str, GError **error)
+fu_plugin_uefi_find_resource (fwup_resource_iter *iter, FuDevice *device, GError **error)
 {
 	efi_guid_t *guid_raw;
 	fwup_resource *re_matched = NULL;
 	fwup_resource *re = NULL;
+	g_autofree gchar *guids_str = NULL;
 
 	/* get the hardware we're referencing */
 	while (fwup_resource_iter_next (iter, &re) > 0) {
@@ -103,22 +104,18 @@ fu_plugin_uefi_find (fwup_resource_iter *iter, const gchar *guid_str, GError **e
 		}
 
 		/* FIXME: also match hardware_instance too */
-		if (g_strcmp0 (guid_str, guid_tmp) == 0) {
-			re_matched = re;
-			break;
-		}
+		if (fu_device_has_guid (device, guid_tmp))
+			return re_matched;
 	}
 
 	/* paradoxically, no hardware matched */
-	if (re_matched == NULL) {
-		g_set_error (error,
-			     FWUPD_ERROR,
-			     FWUPD_ERROR_NOT_SUPPORTED,
-			     "No UEFI firmware matched %s",
-			     guid_str);
-	}
-
-	return re_matched;
+	guids_str = fu_device_get_guids_as_str (device);
+	g_set_error (error,
+		     FWUPD_ERROR,
+		     FWUPD_ERROR_NOT_SUPPORTED,
+		     "No UEFI firmware matched '%s'",
+		     guids_str);
+	return NULL;
 }
 
 static void
@@ -140,7 +137,7 @@ fu_plugin_clear_results (FuPlugin *plugin, FuDevice *device, GError **error)
 
 	/* get the hardware we're referencing */
 	fwup_resource_iter_create (&iter);
-	re = fu_plugin_uefi_find (iter, fu_device_get_guid_default (device), error);
+	re = fu_plugin_uefi_find_resource (iter, device, error);
 	if (re == NULL)
 		return FALSE;
 	if (fwup_clear_status (re) < 0) {
@@ -166,7 +163,7 @@ fu_plugin_get_results (FuPlugin *plugin, FuDevice *device, GError **error)
 
 	/* get the hardware we're referencing */
 	fwup_resource_iter_create (&iter);
-	re = fu_plugin_uefi_find (iter, fu_device_get_guid_default (device), error);
+	re = fu_plugin_uefi_find_resource (iter, device, error);
 	if (re == NULL)
 		return FALSE;
 	if (fwup_get_last_attempt_info (re, &version, &status, &when) < 0) {
@@ -424,7 +421,7 @@ fu_plugin_update (FuPlugin *plugin,
 
 	/* get the hardware we're referencing */
 	fwup_resource_iter_create (&iter);
-	re = fu_plugin_uefi_find (iter, fu_device_get_guid_default (device), error);
+	re = fu_plugin_uefi_find_resource (iter, device, error);
 	if (re == NULL)
 		return FALSE;
 
diff --git a/src/fu-device.c b/src/fu-device.c
index 5a1c2f86a..05abed294 100644
--- a/src/fu-device.c
+++ b/src/fu-device.c
@@ -408,6 +408,27 @@ fu_device_add_guid (FuDevice *device, const gchar *guid)
 	fwupd_device_add_guid (FWUPD_DEVICE (device), guid);
 }
 
+/**
+ * fu_device_get_guids_as_str:
+ * @device: A #FuDevice
+ *
+ * Gets the device GUIDs as a joined string, which may be useful for error
+ * messages.
+ *
+ * Returns: a string, which may be empty length but not %NULL
+ *
+ * Since: 1.0.8
+ **/
+gchar *
+fu_device_get_guids_as_str (FuDevice *device)
+{
+	GPtrArray *guids = fu_device_get_guids (device);
+	g_autofree gchar **tmp = g_new0 (gchar *, guids->len + 1);
+	for (guint i = 0; i < guids->len; i++)
+		tmp[i] = g_ptr_array_index (guids, i);
+	return g_strjoinv (",", tmp);
+}
+
 /**
  * fu_device_get_metadata:
  * @device: A #FuDevice
diff --git a/src/fu-device.h b/src/fu-device.h
index 2c77ad6a7..fab49de70 100644
--- a/src/fu-device.h
+++ b/src/fu-device.h
@@ -117,6 +117,7 @@ void		 fu_device_set_equivalent_id		(FuDevice	*device,
 							 const gchar	*equivalent_id);
 void		 fu_device_add_guid			(FuDevice	*device,
 							 const gchar	*guid);
+gchar		*fu_device_get_guids_as_str		(FuDevice	*device);
 FuDevice	*fu_device_get_alternate		(FuDevice	*device);
 void		 fu_device_set_alternate		(FuDevice	*device,
 							 FuDevice	*alternate);