diff options
author | Toshi Kani <toshi.kani@hp.com> | 2013-07-10 12:47:13 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-14 19:26:18 -0400 |
commit | d19f503e22316a84c39bc19445e0e4fdd49b3532 (patch) | |
tree | 74f7aef19ca9e50869549e4105709e8c69426935 /drivers/acpi/acpi_memhotplug.c | |
parent | 8832f7e43fa7f0f19bd54e13766a825dd1ed4d6f (diff) |
ACPI / memhotplug: Fix a stale pointer in error path
device->driver_data needs to be cleared when releasing its data,
mem_device, in an error path of acpi_memory_device_add().
The function evaluates the _CRS of memory device objects, and fails
when it gets an unexpected resource or cannot allocate memory. A
kernel crash or data corruption may occur when the kernel accesses
the stale pointer.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: 2.6.32+ <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index c711d1144044..999adb5499c7 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
@@ -323,6 +323,7 @@ static int acpi_memory_device_add(struct acpi_device *device, | |||
323 | /* Get the range from the _CRS */ | 323 | /* Get the range from the _CRS */ |
324 | result = acpi_memory_get_device_resources(mem_device); | 324 | result = acpi_memory_get_device_resources(mem_device); |
325 | if (result) { | 325 | if (result) { |
326 | device->driver_data = NULL; | ||
326 | kfree(mem_device); | 327 | kfree(mem_device); |
327 | return result; | 328 | return result; |
328 | } | 329 | } |