Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1365567

[PATCH] intel_menlow: set cdev after null device check to avoid null pointer dereference

Show all headers | View raw

From: Colin Ian King <colin.king@canonical.com>

intel_menlow_memory_remove sanity checks to see if device is null, however,
this check is performed after we have already passed device into a call
to acpi_driver_data.  If device is null, then acpi_driver_data will produce
a null pointer dereference on device. The correct action is to sanity check
device, then assign cdev, then check if cdev is null.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/platform/x86/intel_menlow.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index 0a919d8..185a1bd 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
@@ -196,9 +196,13 @@ static int intel_menlow_memory_add(struct acpi_device *device)
 
 static int intel_menlow_memory_remove(struct acpi_device *device)
 {
-	struct thermal_cooling_device *cdev = acpi_driver_data(device);
+	struct thermal_cooling_device *cdev;
+
+	if (!device)
+		return -EINVAL;
 
-	if (!device || !cdev)
+	cdev = acpi_driver_data(device);
+	if (!cdev)
 		return -EINVAL;
 
 	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] intel_menlow: set cdev after null device check to avoid null pointer dereference Colin King <colin.king@canonical.com> - 2016-03-28 18:20 +0200
  Re: [PATCH] intel_menlow: set cdev after null device check to avoid  null pointer dereference Darren Hart <dvhart@infradead.org> - 2016-03-28 20:30 +0200
    Re: [PATCH] intel_menlow: set cdev after null device check to avoid null pointer dereference "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-03-29 15:20 +0200

csiph-web