diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2009-09-26 20:50:25 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-10-03 06:59:12 +0200 |
commit | d9f65018065ee1b161a85f54132193f248a45439 (patch) | |
tree | 40b3d3f68ee8bc38f6c455c8722c95241690f058 /drivers/acpi/proc.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
download | linux-d9f65018065ee1b161a85f54132193f248a45439.tar.xz linux-d9f65018065ee1b161a85f54132193f248a45439.zip |
ACPI: Fix bound checks for copy_from_user in the acpi /proc code
The ACPI /proc write() code takes an unsigned length argument like any write()
function, but then assigned it to a *signed* integer called "len".
Only after this is a sanity check for len done to make it not larger than 4.
Due to the type change a len < 0 is in principle also possible; this patch
adds a check for this.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/proc.c')
-rw-r--r-- | drivers/acpi/proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index d0d550d22a6d..f8b6f555ba52 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; |