gs_usb driver was performing USB transfers using buffers allocated on the stack
PATCH 1/1 gs_usb driver was 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 Ethan Zonca <[email protected]>
--- drivers/net/can/usb/gs_usb.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-)
drivers/net/can/usb/gs_usb.c +24 -11
@@ -908,10 +908,13 @@ static int gs_usb_probe(struct usb_interface *intf,struct gs_usb *dev;int rc = -ENOMEM ;unsigned int icount, i; -struct gs_host_config hconf = { - .byte_order =0x0000beef , - }; -struct gs_device_config dconf; +struct gs_host_config *hconf; +struct gs_device_config *dconf; + + hconf =kmalloc (sizeof (*hconf),GFP_KERNEL ); + hconf->byte_order =0x0000beef ; + + dconf =kmalloc (sizeof (*dconf),GFP_KERNEL );/* send host config */ rc = usb_control_msg(interface_to_usbdev(intf),
@@ -920,10 +923,12 @@ static int gs_usb_probe(struct usb_interface *intf,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_INTERFACE ,1 , intf->altsetting[0 ].desc.bInterfaceNumber, - &hconf, -sizeof (hconf), + hconf, +sizeof (*hconf), 1000); +kfree (hconf); +if (rc <0 ) {dev_err (&intf->dev,"Couldn't send data format (err=%d)\n" , rc);
@@ -937,28 +942,33 @@ static int gs_usb_probe(struct usb_interface *intf,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_INTERFACE ,1 , intf->altsetting[0 ].desc.bInterfaceNumber, - &dconf, -sizeof (dconf), + dconf, +sizeof (*dconf), 1000);if (rc <0 ) {dev_err (&intf->dev,"Couldn't get device config: (err=%d)\n" , rc); +kfree (dconf);return rc; } - icount = dconf.icount +1 ; + icount = dconf->icount +1 ;dev_info (&intf->dev,"Configuring for %d interfaces\n" , icount);if (icount >GS_MAX_INTF ) {dev_err (&intf->dev,"Driver cannot handle more that %d CAN interfaces\n" ,GS_MAX_INTF ); +kfree (dconf);return -EINVAL ; } dev =kzalloc (sizeof (*dev),GFP_KERNEL ); -if (!dev) +if (!dev) { +kfree (dconf);return -ENOMEM ; + } +init_usb_anchor (&dev->rx_submitted);atomic_set (&dev->active_channels,0 );
@@ -967,7 +977,7 @@ static int gs_usb_probe(struct usb_interface *intf, dev->udev =interface_to_usbdev (intf);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])) {/* save error code to return later */ rc =PTR_ERR (dev->canch[i]);
@@ -978,12 +988,15 @@ static int gs_usb_probe(struct usb_interface *intf,gs_destroy_candev (dev->canch[i]);usb_kill_anchored_urbs (&dev->rx_submitted); +kfree (dconf);kfree (dev);return rc; } dev->canch[i]->parent = dev; } +kfree (dconf); +return 0 ; }
Signature · 1 line
2.11.1
Marc Kleine-Budde
maintainerQuoted 16 lines · Ethan Zonca
This causes the driver to not function with vmapped stacks. Instead, allocate memory for the transfer buffers.
Signed-off-by Ethan Zonca <[email protected]>--- drivers/net/can/usb/gs_usb.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-)drivers/net/can/usb/gs_usb.c +0
-1@@ -908,10 +908,13 @@ static int gs_usb_probe(struct usb_interface *intf,struct gs_usb *dev;int rc = -ENOMEM ;unsigned int icount, i; -struct gs_host_config hconf = {
drivers/net/can/usb/gs_usb.c static int gs_usb_probe(struct usb_interface *intf, · line 917
Quoted 10 lines
drivers/net/can/usb/gs_usb.c +7
-3- .byte_order = 0x0000beef, - }; -struct gs_device_config dconf; +struct gs_host_config *hconf; +struct gs_device_config *dconf; + + hconf =kmalloc (sizeof (*hconf),GFP_KERNEL ); + hconf->byte_order =0x0000beef ; + + dconf =kmalloc (sizeof (*dconf),GFP_KERNEL );
I've added error checking here. Otherwise OK. Applied to can.
Thanks,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |