From: Darren Jenkins <darrenrjenkins@gmail.com>
To: Len Brown <lenb@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>, Thomas Renninger <trenn@suse.de>,
Alexey Dobriyan <adobriyan@gmail.com>,
Matthew Garrett <mjg@redhat.com>,
linux ACPI <linux-acpi@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kernel Janitors <kernel-janitors@vger.kernel.org>
Subject: [PATCH] drivers: acpi: fan.c move a dereference below the NULL test
Date: Thu, 11 Feb 2010 09:56:42 +0000 [thread overview]
Message-ID: <1265882202.27789.0.camel@ICE-BOX> (raw)
In acpi_fan_remove() device is being dereferenced before the NULL test.
This reorders the code to ensure it is checked for NULL first.
Coverity CID: 2758
Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
---
drivers/acpi/fan.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index acf2ab2..dc39640 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -298,9 +298,14 @@ static int acpi_fan_add(struct acpi_device *device)
static int acpi_fan_remove(struct acpi_device *device, int type)
{
- struct thermal_cooling_device *cdev = acpi_driver_data(device);
+ struct thermal_cooling_device *cdev;
+
+ if (!device)
+ return -EINVAL;
+
+ cdev = acpi_driver_data(device);
- if (!device || !cdev)
+ if (!cdev)
return -EINVAL;
acpi_fan_remove_fs(device);
--
1.6.3.3
next reply other threads:[~2010-02-11 9:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-11 9:56 Darren Jenkins [this message]
2010-02-19 5:27 ` [PATCH] drivers: acpi: fan.c move a dereference below the NULL test Len Brown
2010-02-19 11:02 ` Thomas Renninger
2010-02-22 1:37 ` [PATCH] drivers: acpi: fan.c move a dereference below the NULL Zhang Rui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1265882202.27789.0.camel@ICE-BOX \
--to=darrenrjenkins@gmail.com \
--cc=adobriyan@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=rui.zhang@intel.com \
--cc=trenn@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox