aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-02-23 18:23:55 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-23 20:12:15 -0500
commit43fe105a5c91b2f00ea7f900ed307fe980410612 (patch)
tree7f6b9a8a20cd76374e67d50917716f270e82cb19 /drivers
parent79306a340c23e40c94ce16e504d172ae15b24187 (diff)
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 79da4721117fcf188b4b007b775738a530f574da ("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: Jean Delvare <khali@linux-fr.org> Acked-by: Parag Warudkar <parag.warudkar@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Matt Domsch <Matt_Domsch@dell.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/dmi_scan.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index de3027521bfa..4072449ad1cd 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -217,10 +217,6 @@ static void __init dmi_save_devices(const struct dmi_header *dm)
217 } 217 }
218} 218}
219 219
220static struct dmi_device empty_oem_string_dev = {
221 .name = dmi_empty_string,
222};
223
224static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) 220static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
225{ 221{
226 int i, count = *(u8 *)(dm + 1); 222 int i, count = *(u8 *)(dm + 1);
@@ -229,10 +225,8 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
229 for (i = 1; i <= count; i++) { 225 for (i = 1; i <= count; i++) {
230 char *devname = dmi_string(dm, i); 226 char *devname = dmi_string(dm, i);
231 227
232 if (!strcmp(devname, dmi_empty_string)) { 228 if (devname == dmi_empty_string)
233 list_add(&empty_oem_string_dev.list, &dmi_devices);
234 continue; 229 continue;
235 }
236 230
237 dev = dmi_alloc(sizeof(*dev)); 231 dev = dmi_alloc(sizeof(*dev));
238 if (!dev) { 232 if (!dev) {