From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1988036AB4A for ; Sat, 11 Apr 2026 14:11:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775916681; cv=none; b=rG8pI4Tln9OXZkWGMxfX9fMsC5LqwuJQS/xVD7u2TN3rKkE7T1R6mycz3dO0f65FQH4Nz1E/4P306QytNampQRHwzS35Msv84JarBdNjTxilblJWXA3D6iCGTxPGFTtlWAUVzXQYxmLer37u/6P6iX6koMqUvHDii32FGqm2N/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775916681; c=relaxed/simple; bh=3IZWDVxV5IKml+MLHbm4TQvSOkNrVaWNS1SgeurtMuI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j6QoLj+pBXxmVzR31q0LkdcmBcKZMq8NCj/Zb/kckivJqtlVKGcA1C/cYWfZZwBK7YX7JGVapLqaeobv/NcL1PjqlSBzHyH0iBakanQPv/UFB4tVZFp7g0+qv8/C57uVfFVfAHUxt+e2COoR95EI3jAhuPDZZRr8SzxEPYBsDB0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NrF7Xki0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NrF7Xki0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24C82C4CEF7; Sat, 11 Apr 2026 14:11:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775916680; bh=3IZWDVxV5IKml+MLHbm4TQvSOkNrVaWNS1SgeurtMuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NrF7Xki0sKTYX18npAiFnJ4JZZSXkEDNui3yO+Lzisfd0vzChv02ePiDYdJEx5Tqy /foqPyG+cJlo7teZDHOlwERwK8h+8kSKKbuOEYV0uUW8HP7iGmV7BFDcFR996Pu/hB zJ4QQuZREKtrETTyMizvow5zFpf+FLPhTzARDzc8Daefe5JaOYtWaf7TWZhPuqIr9K ffssRb1je49JkJm69yserCe9j+RoxSisxvY+CL+sTPLCFfeAWZaXLQ+zvj5RpEXF/7 2DQuAv+RLko8+4qcAc5gIwniL5LfqFQAWeEBNQNzFQ8LcUrykgc/bBwsKCDaOau9Sd b+WlbOyT72ooQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Kuen-Han Tsai , stable , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y] usb: gadget: u_ether: Fix race between gether_disconnect and eth_stop Date: Sat, 11 Apr 2026 10:11:18 -0400 Message-ID: <20260411141118.767712-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026040856-salutary-stress-ecc2@gregkh> References: <2026040856-salutary-stress-ecc2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kuen-Han Tsai [ Upstream commit e1eabb072c75681f78312c484ccfffb7430f206e ] 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 Signed-off-by: Kuen-Han Tsai Link: https://patch.msgid.link/20260311-gether-disconnect-npe-v1-1-454966adf7c7@google.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/u_ether.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 1f420ff8f4232..e84178bffe780 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -1175,6 +1175,10 @@ void gether_disconnect(struct gether *link) DBG(dev, "%s\n", __func__); + spin_lock(&dev->lock); + dev->port_usb = NULL; + spin_unlock(&dev->lock); + netif_stop_queue(dev->net); netif_carrier_off(dev->net); @@ -1212,10 +1216,6 @@ void gether_disconnect(struct gether *link) dev->header_len = 0; dev->unwrap = NULL; dev->wrap = NULL; - - spin_lock(&dev->lock); - dev->port_usb = NULL; - spin_unlock(&dev->lock); } EXPORT_SYMBOL_GPL(gether_disconnect); -- 2.53.0