From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78EA8C5DF60 for ; Fri, 8 Nov 2019 19:16:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43C1B20650 for ; Fri, 8 Nov 2019 19:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240576; bh=ytOnAIfcvG/evQ4MVX4cYVpQ3AXN30n2C5Jn3Jr09eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tmO6TBBfYSB9uozIPKrhEpPFrfl5ZJ2AyXuZAmp/n4/4d4htTCXEaPxNRSAWQ6UIX VyZo1H7Zq4QWc/oZjaSK0r1c2jSrqcWCbc4gr3/NqtoJMcX0BZLtIIai5i4hDn/TLx RItdXXqiX7EBVlClDIzoxWqvIwkkOhsk7lZ+7UL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390791AbfKHTDb (ORCPT ); Fri, 8 Nov 2019 14:03:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:33200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390775AbfKHTDb (ORCPT ); Fri, 8 Nov 2019 14:03:31 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AB7A2067B; Fri, 8 Nov 2019 19:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239810; bh=ytOnAIfcvG/evQ4MVX4cYVpQ3AXN30n2C5Jn3Jr09eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2nXClX1wRqGAu+LUkugdO0UcHBp+lyC5tWFAuKQpBAVB8zasMxstr7TuDwXpLpD+j WgHVqbkYgCvujVQAdEhmCGPgDxbArPaBdUPsCqhsJGsJFwrmaohsuozQf4El/DUlvj hTmPPBleRe2ZEmGwqc9PMraRD3EdakFOWbE7sYVg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Wagner , Andrew Lunn , "David S. Miller" Subject: [PATCH 4.19 68/79] net: usb: lan78xx: Connect PHY before registering MAC Date: Fri, 8 Nov 2019 19:50:48 +0100 Message-Id: <20191108174823.372405814@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174745.495640141@linuxfoundation.org> References: <20191108174745.495640141@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrew Lunn [ Upstream commit 38b4fe320119859c11b1dc06f6b4987a16344fa1 ] As soon as the netdev is registers, the kernel can start using the interface. If the driver connects the MAC to the PHY after the netdev is registered, there is a race condition where the interface can be opened without having the PHY connected. Change the order to close this race condition. Fixes: 92571a1aae40 ("lan78xx: Connect phy early") Reported-by: Daniel Wagner Signed-off-by: Andrew Lunn Tested-by: Daniel Wagner Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/lan78xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3799,10 +3799,14 @@ static int lan78xx_probe(struct usb_inte /* driver requires remote-wakeup capability during autosuspend. */ intf->needs_remote_wakeup = 1; + ret = lan78xx_phy_init(dev); + if (ret < 0) + goto out4; + ret = register_netdev(netdev); if (ret != 0) { netif_err(dev, probe, netdev, "couldn't register the device\n"); - goto out4; + goto out5; } usb_set_intfdata(intf, dev); @@ -3815,14 +3819,10 @@ static int lan78xx_probe(struct usb_inte pm_runtime_set_autosuspend_delay(&udev->dev, DEFAULT_AUTOSUSPEND_DELAY); - ret = lan78xx_phy_init(dev); - if (ret < 0) - goto out5; - return 0; out5: - unregister_netdev(netdev); + phy_disconnect(netdev->phydev); out4: usb_free_urb(dev->urb_intr); out3: