aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <kees.cook@canonical.com>2010-10-11 11:28:16 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 10:22:08 -0700
commit3ed780117dbe5acb64280d218f0347f238dafed0 (patch)
tree982370602556fe88c5c110529ab9d426a5b72254
parentcfb8da8f69b81d367b766888e83ec0483a31bf01 (diff)
downloadmrst-s0i3-test-3ed780117dbe5acb64280d218f0347f238dafed0.tar.gz
mrst-s0i3-test-3ed780117dbe5acb64280d218f0347f238dafed0.tar.xz
mrst-s0i3-test-3ed780117dbe5acb64280d218f0347f238dafed0.zip
usb: iowarrior: don't trust report_size for buffer size
If the iowarrior devices in this case statement support more than 8 bytes per report, it is possible to write past the end of a kernel heap allocation. This will probably never be possible, but change the allocation to be more defensive anyway. Signed-off-by: Kees Cook <kees.cook@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/misc/iowarrior.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index bc88c79875a..8ed8d05750d 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -374,7 +374,7 @@ static ssize_t iowarrior_write(struct file *file,
case USB_DEVICE_ID_CODEMERCS_IOWPV2:
case USB_DEVICE_ID_CODEMERCS_IOW40:
/* IOW24 and IOW40 use a synchronous call */
- buf = kmalloc(8, GFP_KERNEL); /* 8 bytes are enough for both products */
+ buf = kmalloc(count, GFP_KERNEL);
if (!buf) {
retval = -ENOMEM;
goto exit;