diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-05-27 08:44:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-28 21:50:41 -0400 |
| commit | 72ea18a558ed7a63a50bb121ba60d73b5b38ae30 (patch) | |
| tree | d7a4edbe16735e3b426034748af99f9d2bac10d6 /drivers/usb | |
| parent | 420021a395ce38b7ab2cceb52dee4038be7d8fa3 (diff) | |
USB: mos7720: fix DMA to stack
The read_mos_reg function is called with stack-allocated buffers, which
must not be used for control messages.
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index cc0e54345df9..7752cffbf2bc 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
| @@ -227,11 +227,22 @@ static int read_mos_reg(struct usb_serial *serial, unsigned int serial_portnum, | |||
| 227 | __u8 requesttype = (__u8)0xc0; | 227 | __u8 requesttype = (__u8)0xc0; |
| 228 | __u16 index = get_reg_index(reg); | 228 | __u16 index = get_reg_index(reg); |
| 229 | __u16 value = get_reg_value(reg, serial_portnum); | 229 | __u16 value = get_reg_value(reg, serial_portnum); |
| 230 | int status = usb_control_msg(usbdev, pipe, request, requesttype, value, | 230 | u8 *buf; |
| 231 | index, data, 1, MOS_WDR_TIMEOUT); | 231 | int status; |
| 232 | if (status < 0) | 232 | |
| 233 | buf = kmalloc(1, GFP_KERNEL); | ||
| 234 | if (!buf) | ||
| 235 | return -ENOMEM; | ||
| 236 | |||
| 237 | status = usb_control_msg(usbdev, pipe, request, requesttype, value, | ||
| 238 | index, buf, 1, MOS_WDR_TIMEOUT); | ||
| 239 | if (status == 1) | ||
| 240 | *data = *buf; | ||
| 241 | else if (status < 0) | ||
| 233 | dev_err(&usbdev->dev, | 242 | dev_err(&usbdev->dev, |
| 234 | "mos7720: usb_control_msg() failed: %d", status); | 243 | "mos7720: usb_control_msg() failed: %d", status); |
| 244 | kfree(buf); | ||
| 245 | |||
| 235 | return status; | 246 | return status; |
| 236 | } | 247 | } |
| 237 | 248 | ||