diff options
author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 10:29:11 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 09:51:35 -0700 |
commit | 84c1f11aab59b6e56dd6cf26967127057d4665c9 (patch) | |
tree | 8d5a614cca1bc0c8ec15a34601849fc477815582 | |
parent | a48db008e3d875c6cd33f3d3aa86344e80bab16c (diff) | |
download | lwn-84c1f11aab59b6e56dd6cf26967127057d4665c9.tar.gz lwn-84c1f11aab59b6e56dd6cf26967127057d4665c9.zip |
USB: opticon: fix DMA from stack
commit ea0dbebffe118724cd4df7d9b071ea8ee48d48f0 upstream.
Make sure to allocate the control-message buffer dynamically as some
platforms cannot do DMA from stack.
Note that only the first byte of the old buffer was used.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/opticon.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 96423f3c8ef3..015909039e3c 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c @@ -160,7 +160,11 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, { struct usb_serial *serial = port->serial; int retval; - u8 buffer[2]; + u8 *buffer; + + buffer = kzalloc(1, GFP_KERNEL); + if (!buffer) + return -ENOMEM; buffer[0] = val; /* Send the message to the vendor control endpoint @@ -169,6 +173,7 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, requesttype, USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, 0, 0, buffer, 1, 0); + kfree(buffer); return retval; } |