diff options
author | Kees Cook <kees.cook@canonical.com> | 2010-10-11 11:28:16 -0700 |
---|---|---|
committer | AK <andi@firstfloor.org> | 2011-03-31 11:58:18 -0700 |
commit | 7e150642300a8c69f3e219f960f0d454ca442df8 (patch) | |
tree | 15a18c2aa5713414462d9f2d1e0d8641f2ed3cfc /drivers | |
parent | 91cda1a87e73670380948ad0954a2b544adf88fc (diff) |
usb: iowarrior: don't trust report_size for buffer size
commit 3ed780117dbe5acb64280d218f0347f238dafed0 upstream.
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>
Acked-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/misc/iowarrior.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index b47e694207a3..654243e0c9c0 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -373,7 +373,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; |