diff options
| author | Alex Chiang <achiang@hp.com> | 2010-02-01 10:35:18 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-02-16 03:54:28 -0500 |
| commit | 49c6fb2e41d41c4c0c5c753b6960bc81fe658d20 (patch) | |
| tree | 02a197126bd98b2443de5b84a081ba22190e9eb4 /drivers/acpi/dock.c | |
| parent | 724e6d3fe8003c3f60bf404bf22e4e331327c596 (diff) | |
| download | linux-3.10-49c6fb2e41d41c4c0c5c753b6960bc81fe658d20.tar.gz linux-3.10-49c6fb2e41d41c4c0c5c753b6960bc81fe658d20.tar.bz2 linux-3.10-49c6fb2e41d41c4c0c5c753b6960bc81fe658d20.zip | |
ACPI: dock: properly initialize local struct dock_station in dock_add()
Commit fe06fba2 (ACPI: dock: add struct dock_station * directly
to platform device data) changed dock_add() to use the
platform_device_register_data() API.
We passed that interface a stack variable, which is kmemdup'ed
and assigned to the device's platform_data pointer.
Unfortunately, whatever random garbage is in the stack variable
gets coped during the kmemdup, and that leads to broken behavior.
Explicitly zero out the structure before passing it to the API.
This fixes the T41 docking button issue:
http://bugzilla.kernel.org/show_bug.cgi?id=15000
Cc: stable@kernel.org
Reported-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index bbc2c1315c4..b2586f57e1f 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -935,6 +935,7 @@ static int dock_add(acpi_handle handle) struct platform_device *dd; id = dock_station_count; + memset(&ds, 0, sizeof(ds)); dd = platform_device_register_data(NULL, "dock", id, &ds, sizeof(ds)); if (IS_ERR(dd)) return PTR_ERR(dd); |