Commit 70874867 authored by Jan Beulich's avatar Jan Beulich Committed by Dmitry Torokhov

Input: synaptics - fix crash in synaptics_module_init()

'struct dmi_system_id' arrays must always have a terminator to keep
dmi_check_system() from looking at data (and possibly crashing) it
isn't supposed to look at.

The issue went unnoticed until ef8313bb,
but was introduced about a year earlier with
7705d548 (which also similarly changed
lifebook.c, but the problem there got eliminated shortly afterwards).

The first hunk therefore is a stable candidate back to 2.6.33, while
the full change is needed only on 2.6.38.
Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 799a2a21
...@@ -836,8 +836,8 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = { ...@@ -836,8 +836,8 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
}, },
}, },
{ }
#endif #endif
{ }
}; };
static bool broken_olpc_ec; static bool broken_olpc_ec;
...@@ -851,8 +851,8 @@ static const struct dmi_system_id __initconst olpc_dmi_table[] = { ...@@ -851,8 +851,8 @@ static const struct dmi_system_id __initconst olpc_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "XO"), DMI_MATCH(DMI_PRODUCT_NAME, "XO"),
}, },
}, },
{ }
#endif #endif
{ }
}; };
void __init synaptics_module_init(void) void __init synaptics_module_init(void)
......
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