Commit ec017d6b authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Greg Kroah-Hartman
Browse files

usb: gadget: f_ncm: remove check for NULL skb_tx_data in timer function 



This condition is already checked for in ncm_wrap_ntb(),
except that that check is done with eth_dev->lock held
(it is grabbed by eth_start_xmit).

It's best to not be reaching into ncm struct without locks held.

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: default avatarMaciej Żenczykowski <maze@google.com>
Link: https://lore.kernel.org/r/20210701114834.884597-3-zenczykowski@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf4e2e88

drivers/usb/gadget/function/f_ncm.c

+1 −2
Original line number Diff line number Diff line
@@ -1156,8 +1156,7 @@ static enum hrtimer_restart ncm_tx_timeout(struct hrtimer *data) 
	struct f_ncm *ncm = container_of(data, struct f_ncm, task_timer);

	struct net_device *netdev = READ_ONCE(ncm->netdev);



	/* Only send if data is available. */

	if (netdev && ncm->skb_tx_data) {

	if (netdev) {

		/* XXX This allowance of a NULL skb argument to ndo_start_xmit

		 * XXX is not sane.  The gadget layer should be redesigned so

		 * XXX that the dev->wrap() invocations to build SKBs is transparent