Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200Ab0BKNEG (ORCPT ); Thu, 11 Feb 2010 08:04:06 -0500 Received: from mail-gx0-f224.google.com ([209.85.217.224]:43397 "EHLO mail-gx0-f224.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752286Ab0BKNEB (ORCPT ); Thu, 11 Feb 2010 08:04:01 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=kUFyLkoXfZWcilXpfVe0QdYXWUpSTl4dZqUP3y+/w8JE/dlFJ1+Z/RV38/Z+cGjtIm 1NAbt6ae3w3NV6NVmyox8ZMCoDkHePdETXrlpWdwKGbR5GFc34/Wvdfs+wjTqO/leDyK kXnVUpjMHvb1CltOG1eJAUndUN2OuoEfV9ZMQ= Subject: Re: [PATCH] drivers/acpi/processor_thermal.c From: Darren Jenkins To: Thomas Renninger Cc: Julia Lawall , Len Brown , Zhang Rui , H Hartley Sweeten , Andrew Morton , Alexey Dobriyan , Matthew Garrett , linux ACPI , Linux Kernel Mailing List , Kernel Janitors Content-Type: text/plain; charset="UTF-8" Date: Fri, 12 Feb 2010 00:03:52 +1100 Message-ID: <1265893432.27789.14.camel@ICE-BOX> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3177 Lines: 118 On Thu, Feb 11, 2010 at 10:04 PM, Thomas Renninger wrote: > I expect also Darren has to rebase his fixes on top of this > one then. In case Len decides to go this way, here are the two patches rebased on top of this change and combined into one patch. [PATCH] drivers/acpi/ fix use before NULL checking Fix some use before NULL checks by re-ordering of code in drivers/acpi Coverity CID: 2752 2751 2750 2758 Signed-off-by: Darren Jenkins --- drivers/acpi/fan.c | 9 +++++++-- drivers/acpi/processor_thermal.c | 28 ++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 1290c25..278cebd 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 = device->driver_data; + struct thermal_cooling_device *cdev; + + if (!device) + return -EINVAL; + + cdev = device->driver_data; - if (!device || !cdev) + if (!cdev) return -EINVAL; acpi_fan_remove_fs(device); diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index cd18c98..3c9f8ac 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c @@ -379,9 +379,14 @@ processor_get_max_state(struct thermal_cooling_device *cdev, unsigned long *state) { struct acpi_device *device = cdev->devdata; - struct acpi_processor *pr = device->driver_data; + struct acpi_processor *pr; - if (!device || !pr) + if (!device) + return -EINVAL; + + pr = device->driver_data; + + if (!pr) return -EINVAL; *state = acpi_processor_max_state(pr); @@ -393,9 +398,14 @@ processor_get_cur_state(struct thermal_cooling_device *cdev, unsigned long *cur_state) { struct acpi_device *device = cdev->devdata; - struct acpi_processor *pr = device->driver_data; + struct acpi_processor *pr; + + if (!device) + return -EINVAL; - if (!device || !pr) + pr = device->driver_data; + + if (!pr) return -EINVAL; *cur_state = cpufreq_get_cur_state(pr->id); @@ -409,18 +419,20 @@ processor_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) { struct acpi_device *device = cdev->devdata; - struct acpi_processor *pr = device->driver_data; + struct acpi_processor *pr; int result = 0; int max_pstate; - if (!device || !pr) + if (!device) return -EINVAL; - max_pstate = cpufreq_get_max_state(pr->id); + pr = device->driver_data; - if (state > acpi_processor_max_state(pr)) + if (!pr || state > acpi_processor_max_state(pr)) return -EINVAL; + max_pstate = cpufreq_get_max_state(pr->id); + if (state <= max_pstate) { if (pr->flags.throttling && pr->throttling.state) result = acpi_processor_set_throttling(pr, 0, false); -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/