From: Troy Kisky Date: Thu, 26 Sep 2013 01:41:05 +0000 (-0700) Subject: usb: gadget: ether: return error from rx_submit if no request X-Git-Tag: v2014.01-rc1~207^2~36 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71fc5f91d20ea6466fd6e45235257bec6eb5f413;p=oweals%2Fu-boot.git 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 --- 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;