Commit a90604be authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman

rtl8150: Use heap buffers for all register access

commit 7926aff5 upstream.

Allocating USB buffers on the stack is not portable, and no longer
works on x86_64 (with VMAP_STACK enabled as per default).

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Brad Spengler <spender@grsecurity.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be570e55
...@@ -155,16 +155,36 @@ static const char driver_name [] = "rtl8150"; ...@@ -155,16 +155,36 @@ static const char driver_name [] = "rtl8150";
*/ */
static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data) static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
{ {
return usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), void *buf;
RTL8150_REQ_GET_REGS, RTL8150_REQT_READ, int ret;
indx, 0, data, size, 500);
buf = kmalloc(size, GFP_NOIO);
if (!buf)
return -ENOMEM;
ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
indx, 0, buf, size, 500);
if (ret > 0 && ret <= size)
memcpy(data, buf, ret);
kfree(buf);
return ret;
} }
static int set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data) static int set_registers(rtl8150_t * dev, u16 indx, u16 size, const void *data)
{ {
return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), void *buf;
RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE, int ret;
indx, 0, data, size, 500);
buf = kmemdup(data, size, GFP_NOIO);
if (!buf)
return -ENOMEM;
ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
indx, 0, buf, size, 500);
kfree(buf);
return ret;
} }
static void async_set_reg_cb(struct urb *urb) static void async_set_reg_cb(struct urb *urb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment