diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-09-25 18:41:05 -0700 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2013-10-20 23:42:39 +0200 |
| commit | 71fc5f91d20ea6466fd6e45235257bec6eb5f413 (patch) | |
| tree | e93a8969e476ab47f8196eaaf075cc534b6127a4 /drivers/usb | |
| parent | 43880ce5be8e6e5c26d88705be08161bde55deeb (diff) | |
| download | talos-obmc-uboot-71fc5f91d20ea6466fd6e45235257bec6eb5f413.tar.gz talos-obmc-uboot-71fc5f91d20ea6466fd6e45235257bec6eb5f413.zip | |
usb: gadget: ether: return error from rx_submit if no request
This prevents a crash if tftpboot is given a bad filename.
rx_req will be released by eth_reset_config
which is called by eth_disconnect,
which is called using the .disconnect member of usb_gadget_driver by mv_pullup in mv_udc
which is called using the .pullup member of usb_gadget_ops by usb_gadget_disconnect
which is called by usb_eth_halt
which is called using the .halt member of eth_device by eth_halt
which is called by TftpHandler when TFTP_ERR_FILE_NOT_FOUND or TFTP_ERR_ACCESS_DENIED occurs
I trigger this with the following commands
setenv ipaddr 10.0.0.2 && setenv netmask 255.255.255.0 && setenv serverip 10.0.0.1
setenv usbnet_devaddr 00:11:22:33:44:55 && setenv usbnet_hostaddr 00:aa:bb:cc:dd:ee
setenv ethprime usb_ether && setenv ethact usb_ether && setenv ncip 10.0.0.1
tftpboot 10800000 10.0.0.1:missing_file
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/ether.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 988cffb31c..cc6cc1f32a 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1536,6 +1536,8 @@ static int rx_submit(struct eth_dev *dev, struct usb_request *req, */ debug("%s\n", __func__); + if (!req) + return -EINVAL; size = (ETHER_HDR_SIZE + dev->mtu + RX_EXTRA); size += dev->out_ep->maxpacket - 1; |
