Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753711AbZJVBBk (ORCPT ); Wed, 21 Oct 2009 21:01:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753536AbZJVBBj (ORCPT ); Wed, 21 Oct 2009 21:01:39 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:59269 "EHLO e33.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbZJVBBi (ORCPT ); Wed, 21 Oct 2009 21:01:38 -0400 Date: Wed, 21 Oct 2009 18:01:37 -0700 From: "Darrick J. Wong" To: Andrew Morton Cc: linux-acpi@vger.kernel.org, lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org Subject: [PATCH] acpi_power_meter: Don't leak ACPI error codes to userspace Message-ID: <20091022010137.GB21723@tux1.beaverton.ibm.com> Reply-To: djwong@us.ibm.com MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1134 Lines: 35 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 --- 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, -- 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/