summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Hung <alex.hung@canonical.com>2018-04-13 15:37:59 +0200
committerJean Delvare <jdelvare@suse.de>2018-04-13 15:37:59 +0200
commitde40614de997a388499f9a01d5eeb7cd8d3c34d1 (patch)
tree2fbe8a3297e4187338d9e54b11c8d968870a4dc0 /drivers
parentfirmware: dmi_scan: Fix UUID length safety check (diff)
downloadlinux-de40614de997a388499f9a01d5eeb7cd8d3c34d1.tar.xz
linux-de40614de997a388499f9a01d5eeb7cd8d3c34d1.zip
firmware: dmi_scan: Add DMI_OEM_STRING support to dmi_matches
OEM strings are defined by each OEM and they contain customized and useful OEM information. Supporting it provides more flexible uses of the dmi_matches function. Signed-off-by: Alex Hung <alex.hung@canonical.com> Signed-off-by: Jean Delvare <jdelvare@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/dmi_scan.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index c3be8ef9243f..2c915a847158 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -775,7 +775,15 @@ static bool dmi_matches(const struct dmi_system_id *dmi)
int s = dmi->matches[i].slot;
if (s == DMI_NONE)
break;
- if (dmi_ident[s]) {
+ if (s == DMI_OEM_STRING) {
+ /* DMI_OEM_STRING must be exact match */
+ const struct dmi_device *valid;
+
+ valid = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
+ dmi->matches[i].substr, NULL);
+ if (valid)
+ continue;
+ } else if (dmi_ident[s]) {
if (dmi->matches[i].exact_match) {
if (!strcmp(dmi_ident[s],
dmi->matches[i].substr))