Commit 43fe105a authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

dmi: prevent linked list corruption

Adding the same item to a given linked list more than once is guaranteed
to break and corrupt the list.  This is however what we do in dmi_scan
since commit 79da4721

 ("x86: fix DMI out
of memory problems").

Given that there is absolutely no interest in saving empty OEM strings
anyway, I propose the simple and efficient fix below: we discard the empty
OEM strings altogether.
Signed-off-by: default avatarJean Delvare <>
Acked-by: default avatarParag Warudkar <>
Cc: Ingo Molnar <>
Cc: Thomas Gleixner <>
Cc: Matt Domsch <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 79306a34
......@@ -217,10 +217,6 @@ static void __init dmi_save_devices(const struct dmi_header *dm)
static struct dmi_device empty_oem_string_dev = {
.name = dmi_empty_string,
static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
int i, count = *(u8 *)(dm + 1);
......@@ -229,10 +225,8 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
for (i = 1; i <= count; i++) {
char *devname = dmi_string(dm, i);
if (!strcmp(devname, dmi_empty_string)) {
list_add(&empty_oem_string_dev.list, &dmi_devices);
if (devname == dmi_empty_string)
dev = dmi_alloc(sizeof(*dev));
if (!dev) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment