Commit c919a306 authored by Ethan Zonca's avatar Ethan Zonca Committed by Marc Kleine-Budde

can: gs_usb: Don't use stack memory for USB transfers

Fixes: 05ca5270 can: gs_usb: add ethtool set_phys_id callback to locate physical device

The gs_usb driver is performing USB transfers using buffers allocated on
the stack. This causes the driver to not function with vmapped stacks.
Instead, allocate memory for the transfer buffers.
Signed-off-by: default avatarEthan Zonca <e@ethanzonca.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v4.8
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 9f674e48
...@@ -908,10 +908,14 @@ static int gs_usb_probe(struct usb_interface *intf, ...@@ -908,10 +908,14 @@ static int gs_usb_probe(struct usb_interface *intf,
struct gs_usb *dev; struct gs_usb *dev;
int rc = -ENOMEM; int rc = -ENOMEM;
unsigned int icount, i; unsigned int icount, i;
struct gs_host_config hconf = { struct gs_host_config *hconf;
.byte_order = 0x0000beef, struct gs_device_config *dconf;
};
struct gs_device_config dconf; hconf = kmalloc(sizeof(*hconf), GFP_KERNEL);
if (!hconf)
return -ENOMEM;
hconf->byte_order = 0x0000beef;
/* send host config */ /* send host config */
rc = usb_control_msg(interface_to_usbdev(intf), rc = usb_control_msg(interface_to_usbdev(intf),
...@@ -920,16 +924,22 @@ static int gs_usb_probe(struct usb_interface *intf, ...@@ -920,16 +924,22 @@ static int gs_usb_probe(struct usb_interface *intf,
USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
1, 1,
intf->altsetting[0].desc.bInterfaceNumber, intf->altsetting[0].desc.bInterfaceNumber,
&hconf, hconf,
sizeof(hconf), sizeof(*hconf),
1000); 1000);
kfree(hconf);
if (rc < 0) { if (rc < 0) {
dev_err(&intf->dev, "Couldn't send data format (err=%d)\n", dev_err(&intf->dev, "Couldn't send data format (err=%d)\n",
rc); rc);
return rc; return rc;
} }
dconf = kmalloc(sizeof(*dconf), GFP_KERNEL);
if (!dconf)
return -ENOMEM;
/* read device config */ /* read device config */
rc = usb_control_msg(interface_to_usbdev(intf), rc = usb_control_msg(interface_to_usbdev(intf),
usb_rcvctrlpipe(interface_to_usbdev(intf), 0), usb_rcvctrlpipe(interface_to_usbdev(intf), 0),
...@@ -937,28 +947,33 @@ static int gs_usb_probe(struct usb_interface *intf, ...@@ -937,28 +947,33 @@ static int gs_usb_probe(struct usb_interface *intf,
USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_INTERFACE, USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
1, 1,
intf->altsetting[0].desc.bInterfaceNumber, intf->altsetting[0].desc.bInterfaceNumber,
&dconf, dconf,
sizeof(dconf), sizeof(*dconf),
1000); 1000);
if (rc < 0) { if (rc < 0) {
dev_err(&intf->dev, "Couldn't get device config: (err=%d)\n", dev_err(&intf->dev, "Couldn't get device config: (err=%d)\n",
rc); rc);
kfree(dconf);
return rc; return rc;
} }
icount = dconf.icount + 1; icount = dconf->icount + 1;
dev_info(&intf->dev, "Configuring for %d interfaces\n", icount); dev_info(&intf->dev, "Configuring for %d interfaces\n", icount);
if (icount > GS_MAX_INTF) { if (icount > GS_MAX_INTF) {
dev_err(&intf->dev, dev_err(&intf->dev,
"Driver cannot handle more that %d CAN interfaces\n", "Driver cannot handle more that %d CAN interfaces\n",
GS_MAX_INTF); GS_MAX_INTF);
kfree(dconf);
return -EINVAL; return -EINVAL;
} }
dev = kzalloc(sizeof(*dev), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) if (!dev) {
kfree(dconf);
return -ENOMEM; return -ENOMEM;
}
init_usb_anchor(&dev->rx_submitted); init_usb_anchor(&dev->rx_submitted);
atomic_set(&dev->active_channels, 0); atomic_set(&dev->active_channels, 0);
...@@ -967,7 +982,7 @@ static int gs_usb_probe(struct usb_interface *intf, ...@@ -967,7 +982,7 @@ static int gs_usb_probe(struct usb_interface *intf,
dev->udev = interface_to_usbdev(intf); dev->udev = interface_to_usbdev(intf);
for (i = 0; i < icount; i++) { for (i = 0; i < icount; i++) {
dev->canch[i] = gs_make_candev(i, intf, &dconf); dev->canch[i] = gs_make_candev(i, intf, dconf);
if (IS_ERR_OR_NULL(dev->canch[i])) { if (IS_ERR_OR_NULL(dev->canch[i])) {
/* save error code to return later */ /* save error code to return later */
rc = PTR_ERR(dev->canch[i]); rc = PTR_ERR(dev->canch[i]);
...@@ -978,12 +993,15 @@ static int gs_usb_probe(struct usb_interface *intf, ...@@ -978,12 +993,15 @@ static int gs_usb_probe(struct usb_interface *intf,
gs_destroy_candev(dev->canch[i]); gs_destroy_candev(dev->canch[i]);
usb_kill_anchored_urbs(&dev->rx_submitted); usb_kill_anchored_urbs(&dev->rx_submitted);
kfree(dconf);
kfree(dev); kfree(dev);
return rc; return rc;
} }
dev->canch[i]->parent = dev; dev->canch[i]->parent = dev;
} }
kfree(dconf);
return 0; return 0;
} }
......
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