path: root/drivers/acpi/proc.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-04 14:59:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-04 14:59:53 -0700
commit5001f861219a082e6a64ae61fccea2272bc6751a (patch)
tree83902964d005b026b9f450ff1d7ae6d6d964373b /drivers/acpi/proc.c
parent663cc813a8da4dcc35043998c8856e6ff2ee48fd (diff)
parentc7db7ba5fc84e76044f403efbbba3af5fb01d19b (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: EC: Don't parse DSDT for EC early init on Compal ACPI: EC: Rewrite DMI checks ACPI: dock: fix "sibiling" typo ACPI: kill overly verbose "throttling states" log messages ACPI: Fix bound checks for copy_from_user in the acpi /proc code ACPI: fix bus scanning memory leaks ACPI: EC: Restart command even if no interrupts from EC sony-laptop: Don't unregister the SPIC driver if it wasn't registered sony-laptop: remove _INI call at init time sony-laptop: SPIC unset IRQF_SHARED, set IRQF_DISABLED sony-laptop: remove device_ctrl and the SPIC mini drivers
Diffstat (limited to 'drivers/acpi/proc.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index d0d550d22a6..f8b6f555ba5 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
if (len > 4)
len = 4;
+ if (len < 0)
+ return -EFAULT;
if (copy_from_user(strbuf, buffer, len))
return -EFAULT;