diff options
| author | Kees Cook <kees.cook@canonical.com> | 2010-10-11 11:28:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:45:28 -0700 |
| commit | 6b85e439753bfb9e1665a9697df51600cb864c38 (patch) | |
| tree | 7787f7145c9b6c9ea1fa9baaccfc71e4344d08a7 /drivers/usb | |
| parent | ee269be9e14809eb981021241931c49ad884a25b (diff) | |
| download | kernel-common-6b85e439753bfb9e1665a9697df51600cb864c38.tar.gz kernel-common-6b85e439753bfb9e1665a9697df51600cb864c38.tar.bz2 kernel-common-6b85e439753bfb9e1665a9697df51600cb864c38.zip | |
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>
Diffstat (limited to 'drivers/usb')
| -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 02ff0405d746..cfdcbb8c70b5 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; |