summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2008-01-28 13:53:30 +0800
committerLen Brown <len.brown@intel.com>2008-02-02 02:29:58 -0500
commit87654273ef63213f90c4243913987436495824f0 (patch)
tree153e50bad32997325657b78d759855e797dac20d
parent3abbd337c60591305cbfeb984ff2922c175be37f (diff)
downloadtalos-op-linux-87654273ef63213f90c4243913987436495824f0.tar.gz
talos-op-linux-87654273ef63213f90c4243913987436495824f0.zip
ACPI : Check parameter when calling acpi_processor_get/set_throttling
It is necessary to check the parameter when calling the function of acpi_processor_get/set_throttling function so as to avoid the NULL pointer reference in pr or throttling. http://bugzilla.kernel.org/show_bug.cgi?id=9747 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/processor_throttling.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1685b40abda7..5d2eae207886 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -589,6 +589,11 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)
cpumask_t saved_mask;
int ret;
+ if (!pr)
+ return -EINVAL;
+
+ if (!pr->flags.throttling)
+ return -ENODEV;
/*
* Migrate task to the cpu pointed by pr.
*/
@@ -743,6 +748,16 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
{
cpumask_t saved_mask;
int ret;
+
+ if (!pr)
+ return -EINVAL;
+
+ if (!pr->flags.throttling)
+ return -ENODEV;
+
+ if ((state < 0) || (state > (pr->throttling.state_count - 1)))
+ return -EINVAL;
+
/*
* Migrate task to the cpu pointed by pr.
*/
OpenPOWER on IntegriCloud