diff options
author | Harish Jenny K N <harish_kandiga@mentor.com> | 2016-09-09 05:30:41 -0400 |
---|---|---|
committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-09-09 07:49:02 -0400 |
commit | 79775f441838403be856e06eaab893a3fe9dd7b2 (patch) | |
tree | a6809b94b9d61b4e572e3a229b872bc69aa096f8 | |
parent | 5387c920372a3aaeb97b8b4721619ca9ff2a82ab (diff) |
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>
-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, | |||
571 | req->complete = tx_complete; | 571 | req->complete = tx_complete; |
572 | 572 | ||
573 | /* NCM requires no zlp if transfer is dwNtbInMaxSize */ | 573 | /* NCM requires no zlp if transfer is dwNtbInMaxSize */ |
574 | if (dev->port_usb->is_fixed && | 574 | if (dev->port_usb && |
575 | dev->port_usb->is_fixed && | ||
575 | length == dev->port_usb->fixed_in_len && | 576 | length == dev->port_usb->fixed_in_len && |
576 | (length % in->maxpacket) == 0) | 577 | (length % in->maxpacket) == 0) |
577 | req->zero = 0; | 578 | req->zero = 0; |