diff options
| author |   Harish Jenny K N <harish_kandiga@mentor.com> | 2016-09-09 11:30:41 +0200 |
|---|---|---|
| committer |   Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-09-09 14:49:02 +0300 |
| commit | 79775f441838403be856e06eaab893a3fe9dd7b2 (patch) | |
| tree | a6809b94b9d61b4e572e3a229b872bc69aa096f8 /drivers/usb/gadget/function/u_ether.c | |
| parent | usb: gadget: remove variable ret and remove unnecessary if statement (diff) | |
| download | linux-dev-79775f441838403be856e06eaab893a3fe9dd7b2.tar.xz linux-dev-79775f441838403be856e06eaab893a3fe9dd7b2.zip | |
usb: gadget: u_ether: fix another dereference after null check
dev->port_usb is checked for null pointer previously, so dev->port_usb
might be null during no zlp check, fix it by adding null pointer check.
Acked-by: Jim Baxter <jim_baxter@mentor.com>
Signed-off-by: Harish Jenny K N <harish_kandiga@mentor.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/gadget/function/u_ether.c')
| -rw-r--r-- | drivers/usb/gadget/function/u_ether.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 3be4b93fd415..9c8c9ed1dc9e 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -571,7 +571,8 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, req->complete = tx_complete; /* NCM requires no zlp if transfer is dwNtbInMaxSize */ - if (dev->port_usb->is_fixed && + if (dev->port_usb && + dev->port_usb->is_fixed && length == dev->port_usb->fixed_in_len && (length % in->maxpacket) == 0) req->zero = 0; |