diff options
author | Oliver Neukum <oneukum@suse.de> | 2014-05-19 07:54:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 19:03:57 -0400 |
commit | d846b7650db3fcca7901b6e23f6416c3601a3dfe (patch) | |
tree | 750ca1f6bd5b2b287a9123f7208589d4f9264b67 /drivers/usb | |
parent | d1b781002b31247d38a2892c51b88348d6a8f201 (diff) |
USB: usbtmc: fix DMA on stack
send_request_dev_dep_msg_in() use a buffer allocated on the stack.
Fix by kmalloc()ing the buffer.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/class/usbtmc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index cfbec9c7e09e..103a6e9ee49d 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
@@ -383,9 +383,12 @@ exit: | |||
383 | static int send_request_dev_dep_msg_in(struct usbtmc_device_data *data, size_t transfer_size) | 383 | static int send_request_dev_dep_msg_in(struct usbtmc_device_data *data, size_t transfer_size) |
384 | { | 384 | { |
385 | int retval; | 385 | int retval; |
386 | u8 buffer[USBTMC_HEADER_SIZE]; | 386 | u8 *buffer; |
387 | int actual; | 387 | int actual; |
388 | 388 | ||
389 | buffer = kmalloc(USBTMC_HEADER_SIZE, GFP_KERNEL); | ||
390 | if (!buffer) | ||
391 | return -ENOMEM; | ||
389 | /* Setup IO buffer for REQUEST_DEV_DEP_MSG_IN message | 392 | /* Setup IO buffer for REQUEST_DEV_DEP_MSG_IN message |
390 | * Refer to class specs for details | 393 | * Refer to class specs for details |
391 | */ | 394 | */ |
@@ -417,6 +420,7 @@ static int send_request_dev_dep_msg_in(struct usbtmc_device_data *data, size_t t | |||
417 | if (!data->bTag) | 420 | if (!data->bTag) |
418 | data->bTag++; | 421 | data->bTag++; |
419 | 422 | ||
423 | kfree(buffer); | ||
420 | if (retval < 0) { | 424 | if (retval < 0) { |
421 | dev_err(&data->intf->dev, "usb_bulk_msg in send_request_dev_dep_msg_in() returned %d\n", retval); | 425 | dev_err(&data->intf->dev, "usb_bulk_msg in send_request_dev_dep_msg_in() returned %d\n", retval); |
422 | return retval; | 426 | return retval; |