From: Dan Carpenter <error27@gmail.com>
Date: Sun, 27 Feb 2011 14:13:25 +0000 (+0300)
Subject: sony-laptop: potential null dereference
X-Git-Tag: v2.6.39-rc1~20^2^2~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=200140bdb52b259380e9082e2a4f25a4ddbb5d68;p=~shefty%2Frdma-dev.git

sony-laptop: potential null dereference

In the original code, if "device_enum" was NULL then it would
dereference it when it printed the error message.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
---

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index bd1b9adfbaf..4ab898a39fe 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1311,7 +1311,11 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)
 	}
 
 	device_enum = (union acpi_object *) buffer.pointer;
-	if (!device_enum || device_enum->type != ACPI_TYPE_BUFFER) {
+	if (!device_enum) {
+		pr_err(DRV_PFX "No SN06 return object.");
+		goto out_no_enum;
+	}
+	if (device_enum->type != ACPI_TYPE_BUFFER) {
 		pr_err(DRV_PFX "Invalid SN06 return object 0x%.2x\n",
 				device_enum->type);
 		goto out_no_enum;