| From b05c73bd1e3ec60357580eb042ee932a5ed754d5 Mon Sep 17 00:00:00 2001 |
| From: Maksim Salau <maksim.salau@gmail.com> |
| Date: Sun, 23 Apr 2017 20:31:40 +0300 |
| Subject: net: can: usb: gs_usb: Fix buffer on stack |
| |
| From: Maksim Salau <maksim.salau@gmail.com> |
| |
| commit b05c73bd1e3ec60357580eb042ee932a5ed754d5 upstream. |
| |
| Allocate buffers on HEAP instead of STACK for local structures |
| that are to be sent using usb_control_msg(). |
| |
| Signed-off-by: Maksim Salau <maksim.salau@gmail.com> |
| Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/can/usb/gs_usb.c | 17 ++++++++++++----- |
| 1 file changed, 12 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/net/can/usb/gs_usb.c |
| +++ b/drivers/net/can/usb/gs_usb.c |
| @@ -740,13 +740,18 @@ static const struct net_device_ops gs_us |
| static int gs_usb_set_identify(struct net_device *netdev, bool do_identify) |
| { |
| struct gs_can *dev = netdev_priv(netdev); |
| - struct gs_identify_mode imode; |
| + struct gs_identify_mode *imode; |
| int rc; |
| |
| + imode = kmalloc(sizeof(*imode), GFP_KERNEL); |
| + |
| + if (!imode) |
| + return -ENOMEM; |
| + |
| if (do_identify) |
| - imode.mode = GS_CAN_IDENTIFY_ON; |
| + imode->mode = GS_CAN_IDENTIFY_ON; |
| else |
| - imode.mode = GS_CAN_IDENTIFY_OFF; |
| + imode->mode = GS_CAN_IDENTIFY_OFF; |
| |
| rc = usb_control_msg(interface_to_usbdev(dev->iface), |
| usb_sndctrlpipe(interface_to_usbdev(dev->iface), |
| @@ -756,10 +761,12 @@ static int gs_usb_set_identify(struct ne |
| USB_RECIP_INTERFACE, |
| dev->channel, |
| 0, |
| - &imode, |
| - sizeof(imode), |
| + imode, |
| + sizeof(*imode), |
| 100); |
| |
| + kfree(imode); |
| + |
| return (rc > 0) ? 0 : rc; |
| } |
| |