Commit 15c82136 authored Jul 01, 2021 by Maciej Żenczykowski Committed by Greg Kroah-Hartman Sep 22, 2021

usb: gadget: u_ether: fix a potential null pointer dereference



[ Upstream commit 8ae01239609b29ec2eff55967c8e0fe3650cfa09 ]

f_ncm tx timeout can call us with null skb to flush
a pending frame.  In this case skb is NULL to begin
with but ceases to be null after dev->wrap() completes.

In such a case in->maxpacket will be read, even though
we've failed to check that 'in' is not NULL.

Though I've never observed this fail in practice,
however the 'flush operation' simply does not make sense with
a null usb IN endpoint - there's nowhere to flush to...
(note that we're the gadget/device, and IN is from the point
 of view of the host, so here IN actually means outbound...)

Cc: Brooke Basile <brookebasile@gmail.com>
Cc: "Bryan O'Donoghue" <bryan.odonoghue@linaro.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Link: https://lore.kernel.org/r/20210701114834.884597-6-zenczykowski@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 36415d6a

drivers/usb/gadget/function/u_ether.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -507,7 +507,8 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
		}
		spin_unlock_irqrestore(&dev->lock, flags);

		if (skb && !in) {
		if (!in) {
		if (skb)
		dev_kfree_skb_any(skb);
		return NETDEV_TX_OK;
		}