public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] acpi_power_meter: Don't leak ACPI error codes to userspace
@ 2009-10-22  1:01 Darrick J. Wong
  2009-10-22  7:27 ` [lm-sensors] " Jean Delvare
  0 siblings, 1 reply; 3+ messages in thread
From: Darrick J. Wong @ 2009-10-22  1:01 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-acpi, lm-sensors, linux-kernel

acpi-power-meter: Don't leak ACPI error codes to userspace

If the ACPI methods return an error code, we must return -EINVAL to userspace
to flag the error.  Right now we pass the (positive) number right through,
which causes echo to keep writing bogus values.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---

 drivers/acpi/power_meter.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
index e6bfd77..2ef7030 100644
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -294,7 +294,11 @@ static int set_acpi_trip(struct acpi_power_meter_resource *resource)
 		return -EINVAL;
 	}
 
-	return data;
+	/* _PTP returns 0 on success, nonzero otherwise */
+	if (data)
+		return -EINVAL;
+
+	return 0;
 }
 
 static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [lm-sensors] [PATCH] acpi_power_meter: Don't leak ACPI error codes  to userspace
  2009-10-22  1:01 [PATCH] acpi_power_meter: Don't leak ACPI error codes to userspace Darrick J. Wong
@ 2009-10-22  7:27 ` Jean Delvare
  2009-11-05 17:25   ` Len Brown
  0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2009-10-22  7:27 UTC (permalink / raw)
  To: djwong; +Cc: Andrew Morton, linux-acpi, linux-kernel, lm-sensors

On Wed, 21 Oct 2009 18:01:37 -0700, Darrick J. Wong wrote:
> acpi-power-meter: Don't leak ACPI error codes to userspace
> 
> If the ACPI methods return an error code, we must return -EINVAL to userspace
> to flag the error.  Right now we pass the (positive) number right through,
> which causes echo to keep writing bogus values.
> 
> Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>

Acked-by: Jean Delvare <khali@linux-fr.org>

> ---
> 
>  drivers/acpi/power_meter.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> 
> diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
> index e6bfd77..2ef7030 100644
> --- a/drivers/acpi/power_meter.c
> +++ b/drivers/acpi/power_meter.c
> @@ -294,7 +294,11 @@ static int set_acpi_trip(struct acpi_power_meter_resource *resource)
>  		return -EINVAL;
>  	}
>  
> -	return data;
> +	/* _PTP returns 0 on success, nonzero otherwise */
> +	if (data)
> +		return -EINVAL;
> +
> +	return 0;
>  }
>  
>  static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,

-- 
Jean Delvare

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [lm-sensors] [PATCH] acpi_power_meter: Don't leak ACPI error codes to userspace
  2009-10-22  7:27 ` [lm-sensors] " Jean Delvare
@ 2009-11-05 17:25   ` Len Brown
  0 siblings, 0 replies; 3+ messages in thread
From: Len Brown @ 2009-11-05 17:25 UTC (permalink / raw)
  To: Jean Delvare; +Cc: djwong, Andrew Morton, linux-acpi, linux-kernel, lm-sensors

applied

thanks,
Len Brown, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-11-05 17:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-22  1:01 [PATCH] acpi_power_meter: Don't leak ACPI error codes to userspace Darrick J. Wong
2009-10-22  7:27 ` [lm-sensors] " Jean Delvare
2009-11-05 17:25   ` Len Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox