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 08D722D5C76; Tue, 12 Aug 2025 17:55:12 +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=1755021312; cv=none; b=oxPey1b4+9UALtjfpJEAT+GONLyQh3rmdDMYXzV7Kw3x5ImGUiF/CVqIWwfoBcvDBzu7ExXxP5Ac7i+rZLoHO6PIwIvWXQpccfIPXHsjoXqT30Blbhxvg+qFPl0VVlF6wtectuRoExuhxeU1tjNC9ZQaCs9uFkue928zrxdydHk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021312; c=relaxed/simple; bh=41kz+xapXVWncwHSjSvbspbDSvphzDqtjI3ZhwIYIX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HAaG9gFZWcfnU1tQf3s/vVhDEeWD4dys/eJi9WzyWBz54P9eHtk4t7RnufPhyR62OPF5RQnk85qcV/9/AX1F9lKhe+jFbeRLfqgPqPIvcCZmSg7//ipxqytqq4xuw2w0VSxvtHnpuZAOUNoExOnx4axjXEXdkbk/io7qa+KXRkU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Zdofvasz; 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="Zdofvasz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6967BC4CEF7; Tue, 12 Aug 2025 17:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755021311; bh=41kz+xapXVWncwHSjSvbspbDSvphzDqtjI3ZhwIYIX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZdofvaszNahiln45nOhbv8Eo7p4RRFFQIZ/vOz/7yd6DkH8tZBv4YZyj++duq05G6 4o35iOVGZopjpxEiHXh8Bhj0CuFVkZeaQlwdHNYyGxQW2Pw6GboZ4EIYn3SnMnaSVL JQNBnVz8VTeTeZi38AlLcBXmh/qsgLt1Vc44SKNM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Armando Budianto , Simon Horman , Linus Torvalds , Ammar Faizi Subject: [PATCH 6.1 246/253] net: usbnet: Fix the wrong netif_carrier_on() call Date: Tue, 12 Aug 2025 19:30:34 +0200 Message-ID: <20250812172959.330266948@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812172948.675299901@linuxfoundation.org> References: <20250812172948.675299901@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ammar Faizi commit 8466d393700f9ccef68134d3349f4e0a087679b9 upstream. The commit referenced in the Fixes tag causes usbnet to malfunction (identified via git bisect). Post-commit, my external RJ45 LAN cable fails to connect. Linus also reported the same issue after pulling that commit. The code has a logic error: netif_carrier_on() is only called when the link is already on. Fix this by moving the netif_carrier_on() call outside the if-statement entirely. This ensures it is always called when EVENT_LINK_CARRIER_ON is set and properly clears it regardless of the link state. Cc: stable@vger.kernel.org Cc: Armando Budianto Reviewed-by: Simon Horman Suggested-by: Linus Torvalds Link: https://lore.kernel.org/all/CAHk-=wjqL4uF0MG_c8+xHX1Vv8==sPYQrtzbdA3kzi96284nuQ@mail.gmail.com Closes: https://lore.kernel.org/netdev/CAHk-=wjKh8X4PT_mU1kD4GQrbjivMfPn-_hXa6han_BTDcXddw@mail.gmail.com Closes: https://lore.kernel.org/netdev/0752dee6-43d6-4e1f-81d2-4248142cccd2@gnuweeb.org Fixes: 0d9cfc9b8cb1 ("net: usbnet: Avoid potential RCU stall on LINK_CHANGE event") Signed-off-by: Ammar Faizi Signed-off-by: Linus Torvalds 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 @@ -1115,6 +1115,9 @@ static void __handle_link_change(struct if (!test_bit(EVENT_DEV_OPEN, &dev->flags)) return; + if (test_and_clear_bit(EVENT_LINK_CARRIER_ON, &dev->flags)) + netif_carrier_on(dev->net); + if (!netif_carrier_ok(dev->net)) { /* kill URBs for reading packets to save bus bandwidth */ unlink_urbs(dev, &dev->rxq); @@ -1124,9 +1127,6 @@ static void __handle_link_change(struct * tx queue is stopped by netcore after link becomes off */ } else { - if (test_and_clear_bit(EVENT_LINK_CARRIER_ON, &dev->flags)) - netif_carrier_on(dev->net); - /* submitting URBs for reading packets */ tasklet_schedule(&dev->bh); }