Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

usb: gadget: u_ether: Fix race between gether_disconnect and eth_stop

A race condition between gether_disconnect() and eth_stop() leads to a
NULL pointer dereference. Specifically, if eth_stop() is triggered
concurrently while gether_disconnect() is tearing down the endpoints,
eth_stop() attempts to access the cleared endpoint descriptor, causing
the following NPE:

Unable to handle kernel NULL pointer dereference
Call trace:
__dwc3_gadget_ep_enable+0x60/0x788
dwc3_gadget_ep_enable+0x70/0xe4
usb_ep_enable+0x60/0x15c
eth_stop+0xb8/0x108

Because eth_stop() crashes while holding the dev->lock, the thread
running gether_disconnect() fails to acquire the same lock and spins
forever, resulting in a hardlockup:

Core - Debugging Information for Hardlockup core(7)
Call trace:
queued_spin_lock_slowpath+0x94/0x488
_raw_spin_lock+0x64/0x6c
gether_disconnect+0x19c/0x1e8
ncm_set_alt+0x68/0x1a0
composite_setup+0x6a0/0xc50

The root cause is that the clearing of dev->port_usb in
gether_disconnect() is delayed until the end of the function.

Move the clearing of dev->port_usb to the very beginning of
gether_disconnect() while holding dev->lock. This cuts off the link
immediately, ensuring eth_stop() will see dev->port_usb as NULL and
safely bail out.

Fixes: 2b3d942c4878 ("usb ethernet gadget: split out network core")
Cc: stable <stable@kernel.org>
Signed-off-by: Kuen-Han Tsai <khtsai@google.com>
Link: https://patch.msgid.link/20260311-gether-disconnect-npe-v1-1-454966adf7c7@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Kuen-Han Tsai and committed by
Greg Kroah-Hartman
e1eabb07 769cafe4

+5 -5
+5 -5
drivers/usb/gadget/function/u_ether.c
··· 1223 1223 1224 1224 DBG(dev, "%s\n", __func__); 1225 1225 1226 + spin_lock(&dev->lock); 1227 + dev->port_usb = NULL; 1228 + link->is_suspend = false; 1229 + spin_unlock(&dev->lock); 1230 + 1226 1231 netif_stop_queue(dev->net); 1227 1232 netif_carrier_off(dev->net); 1228 1233 ··· 1265 1260 dev->header_len = 0; 1266 1261 dev->unwrap = NULL; 1267 1262 dev->wrap = NULL; 1268 - 1269 - spin_lock(&dev->lock); 1270 - dev->port_usb = NULL; 1271 - link->is_suspend = false; 1272 - spin_unlock(&dev->lock); 1273 1263 } 1274 1264 EXPORT_SYMBOL_GPL(gether_disconnect); 1275 1265