Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 66e13e66b6c4e5b2ecd6225e1f8437640cfb6498

Authored by Jean Delvare
Committed by Linus Torvalds
1 parent 5aecc85abd
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused 

The current implementation of dmi_name_in_vendors() is an invitation to
lazy coding and false positives [1].  Searching for a string in 8 know
what you're looking for, so you should know where to look.  strstr isn't
fast, especially when it fails, so we should avoid calling it when it
just can't succeed.

Looking at the current users of the function, it seems clear to me that
they are looking for a system or board vendor name, so let's limit
dmi_name_in_vendors to these two DMI fields.  This much better matches
the function name, BTW.

[1] We currently have code looking for short names in DMI data, such as
"IBM", "ASUS" or "Acer".  I let you guess what will happen the day other
vendors ship products named, for example, "SCHREIBMEISTER", "PEGASUS" or
"Acerola".

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

drivers/firmware/dmi_scan.c
Diff comments   View file @ 66e13e6
... ... @@ -585,14 +585,12 @@
585 585 }
586 586  
587 587 /**
588   - * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information.
  588 + * dmi_name_in_vendors - Check if string is in the DMI system or board vendor name
589 589 * @str: Case sensitive Name
590 590 */
591 591 int dmi_name_in_vendors(const char *str)
592 592 {
593   - static int fields[] = { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_SYS_VENDOR,
594   - DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, DMI_BOARD_VENDOR,
595   - DMI_BOARD_NAME, DMI_BOARD_VERSION, DMI_NONE };
  593 + static int fields[] = { DMI_SYS_VENDOR, DMI_BOARD_VENDOR, DMI_NONE };
596 594 int i;
597 595 for (i = 0; fields[i] != DMI_NONE; i++) {
598 596 int f = fields[i];