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 03643276028; Tue, 8 Apr 2025 12:39:30 +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=1744115971; cv=none; b=NKi55GUEflhFqCsTFRLI7uy9mSrS5IiLoiu9kNu0L9ylifO/6BYVlz1Z12Bq0otyCYaQMpTDmSyKzVxOTbGPR/eeCwTFi18EYVAp3uO52ysumnYjtO4Q67qTw4AGyiO1ko9jLMivBoQxpQ1y8PtXeRa+3im5UbY2h43ldXse5iQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115971; c=relaxed/simple; bh=OE9Bs42ipV6JGaHfuEczIFUwpVMDYnEzXRgQRiQpkc0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dt0/WFv8KtbN05HLmJR0aFm/QLhjFbw6gVOch1UABwbi5M1ofUJywBLub+/dEgbVpaN9j5ZGN4Bkj4bTYnn+nY4wlngdS1FLb2fk0ZFrw/3UeUg7ycWxOerknwC8uXglR2wIcKZSUHV3qOInjD9oJpsvfeOu+o+rYdjXg+8r2Uk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ozwghHeg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ozwghHeg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2619FC4CEE5; Tue, 8 Apr 2025 12:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115970; bh=OE9Bs42ipV6JGaHfuEczIFUwpVMDYnEzXRgQRiQpkc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ozwghHegmO1vJ4CRH4ejEigHPYYKM1IkleGbYsr1PS7+Z+zvS1899kRmU7Do82E88 /GgRi5P04XORcfkeLJfhUyLTxM/wGJiYP3/pIGaciJsCTqy/NPP1Yj8YAN9b4Ym83B iGPJ0oo3jiig91fqEJBFJlT5lgAwbyvKOtQHoxWY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ying Lu , Jakub Kicinski Subject: [PATCH 6.1 173/204] usbnet:fix NPE during rx_complete Date: Tue, 8 Apr 2025 12:51:43 +0200 Message-ID: <20250408104825.391861875@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ying Lu commit 51de3600093429e3b712e5f091d767babc5dd6df upstream. Missing usbnet_going_away Check in Critical Path. The usb_submit_urb function lacks a usbnet_going_away validation, whereas __usbnet_queue_skb includes this check. This inconsistency creates a race condition where: A URB request may succeed, but the corresponding SKB data fails to be queued. Subsequent processes: (e.g., rx_complete → defer_bh → __skb_unlink(skb, list)) attempt to access skb->next, triggering a NULL pointer dereference (Kernel Panic). Fixes: 04e906839a05 ("usbnet: fix cyclical race on disconnect with work queue") Cc: stable@vger.kernel.org Signed-off-by: Ying Lu Link: https://patch.msgid.link/4c9ef2efaa07eb7f9a5042b74348a67e5a3a7aea.1743584159.git.luying1@xiaomi.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/usbnet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -530,7 +530,8 @@ static int rx_submit (struct usbnet *dev netif_device_present (dev->net) && test_bit(EVENT_DEV_OPEN, &dev->flags) && !test_bit (EVENT_RX_HALT, &dev->flags) && - !test_bit (EVENT_DEV_ASLEEP, &dev->flags)) { + !test_bit (EVENT_DEV_ASLEEP, &dev->flags) && + !usbnet_going_away(dev)) { switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) { case -EPIPE: usbnet_defer_kevent (dev, EVENT_RX_HALT); @@ -551,8 +552,7 @@ static int rx_submit (struct usbnet *dev tasklet_schedule (&dev->bh); break; case 0: - if (!usbnet_going_away(dev)) - __usbnet_queue_skb(&dev->rxq, skb, rx_start); + __usbnet_queue_skb(&dev->rxq, skb, rx_start); } } else { netif_dbg(dev, ifdown, dev->net, "rx: stopped\n");