diff options
| author | Jan Beulich <JBeulich@novell.com> | 2011-03-31 00:01:58 -0700 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:10 -0700 |
| commit | dffa5ee4119483e30441071cfc7d94f74e82d1e9 (patch) | |
| tree | 0119d056e68c5bef2b1a32747aa8527cadc0930f | |
| parent | 4aa96ce73e0282f556fdc5850313a4d0ca15532f (diff) | |
Input: synaptics - fix crash in synaptics_module_init()
[ upstream commit 708748670c7c6dd5bd3b141473086e6937e72737 ]
'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 ef8313bb1a22e7d2125d9d758aa8a81f1de91d81,
but was introduced about a year earlier with
7705d548cbe33f18ea7713b9a07aa11047aaeca4 (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: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 705589dc9ac5..4009b4101664 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -712,8 +712,8 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = { }, }, - { } #endif + { } }; void __init synaptics_module_init(void) |