Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71893f11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull dmi updates from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Use lowercase letters for UUID
  firmware: dmi_scan: Add DMI_OEM_STRING support to dmi_matches
  firmware: dmi_scan: Fix UUID length safety check
parents f6811370 712ff254

drivers/firmware/dmi_scan.c

+12 −4
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, 
	char *s;

	int is_ff = 1, is_00 = 1, i;



	if (dmi_ident[slot] || dm->length <= index + 16)

	if (dmi_ident[slot] || dm->length < index + 16)

		return;



	d = (u8 *) dm + index;
@@ -211,9 +211,9 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, 
	 * says that this is the defacto standard.

	 */

	if (dmi_ver >= 0x020600)

		sprintf(s, "%pUL", d);

		sprintf(s, "%pUl", d);

	else

		sprintf(s, "%pUB", d);

		sprintf(s, "%pUb", d);



	dmi_ident[slot] = s;

}
@@ -792,7 +792,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))

include/linux/mod_devicetable.h

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ enum dmi_field { 
	DMI_CHASSIS_SERIAL,

	DMI_CHASSIS_ASSET_TAG,

	DMI_STRING_MAX,

	DMI_OEM_STRING,	/* special case - will not be in dmi_ident */

};



struct dmi_strmatch {