mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
rtl8150: Use heap buffers for all register access
Allocating USB buffers on the stack is not portable, and no longer
works on x86_64 (with VMAP_STACK enabled as per default).
Fixes: 1da177e4c3
("Linux-2.6.12-rc2")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5593523f96
commit
7926aff5c5
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user