proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-30 08:39:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thunderbolt: correct handling of unknown devices

Browse Source 
For unknown device only vendor and model IDs should be checked

Signed-off-by: Yehezkel Bernat <yehezkel.bernat@intel.com>
This commit is contained in:
Yehezkel Bernat 2018-03-09 14:48:58 +02:00 committed by Richard Hughes
parent 2872867110
commit 1ccd5d0bbd
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/thunderbolt/fu-thunderbolt-image.c
View File

@ -456,7 +456,6 @@ get_device_locations (guint16 id)
case 0x15D3: case 0x15D3:
case 0x15DA: case 0x15DA:
case 0x15C0: case 0x15C0:
case 0:
return locations; return locations;
default: default:
return NULL; return NULL;
@ -586,6 +585,15 @@ fu_plugin_thunderbolt_validate_image (GBytes *controller_fw,
return VALIDATION_FAILED; return VALIDATION_FAILED;
} }
/*
* 0 is for the unknown device case, for being future-compatible with
* new devices; so we can't know which locations to check besides the
* vendor and model IDs that were validated already, but those should be
* good enough validation.
*/
if (hw_info->id == 0)
return UNKNOWN_DEVICE;
locations = is_host ? locations = is_host ?
get_host_locations (hw_info->id) : get_host_locations (hw_info->id) :
get_device_locations (hw_info->id); get_device_locations (hw_info->id);
@ -605,7 +613,7 @@ fu_plugin_thunderbolt_validate_image (GBytes *controller_fw,
return VALIDATION_FAILED; return VALIDATION_FAILED;
} }
return hw_info->id != 0 ? VALIDATION_PASSED : UNKNOWN_DEVICE; return VALIDATION_PASSED;
} }
gboolean gboolean