From patchwork Mon Nov 28 18:25:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9449929 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 33F8260757 for ; Mon, 28 Nov 2016 18:28:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A7C427FB3 for ; Mon, 28 Nov 2016 18:28:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F06A27FA7; Mon, 28 Nov 2016 18:28:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C08B327FB3 for ; Mon, 28 Nov 2016 18:28:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754574AbcK1S21 (ORCPT ); Mon, 28 Nov 2016 13:28:27 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36326 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752427AbcK1S1d (ORCPT ); Mon, 28 Nov 2016 13:27:33 -0500 Received: by mail-lf0-f66.google.com with SMTP id o20so10330392lfg.3; Mon, 28 Nov 2016 10:27:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WCEo7F5IoAFfRsLWXyt7eTy6D7MmxuvEXuVjZbHlOuw=; b=ZwRil8RsuXbb2efVS3FOwcPRngdCHn3N2WbzQ5b+m7vhUInlZHpIpnPSVgvLqA1Fhz iRP7M7tBj1a6b8lZVvcWBFFQAdE9uU6pwju9HpAEgW7Tk2oEvnflSDSJMoUsrUdwWFK5 uFVE3zfjOBuUlva45s0YF7b/uPrMurl8FX4lIEO2oL6TBGx6c+Sj1TexQVCv2JHc2ADh /YAC9/1mXREzMTcWQ43F//rNNQs4hGGqJgBXXejVHw+U6JGD221uUSeXcsDyRv+LTPtb IptD1RMg4JrBDpKnfzKwzsVX5OJhSpA+hIzrZZ+XBshi67qBAi9D9oBu9I9h7RXgSA1q CDIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=WCEo7F5IoAFfRsLWXyt7eTy6D7MmxuvEXuVjZbHlOuw=; b=LU0ZM59+dF4CdAO2g41KhmJHjDPKIj8Hl0vLp737fCHJvX4B/rhD7M7oAX0yCby9dJ FTSIT8QKoe+Niqzz73TRJ98CNO9rkgveez+nZcYS+7PyQiKtUv67SBOXvC0cMkgJd4B2 4bjA15GsbShsmSRB8bY2u/DtXPV/pZl/5m4QlOphN1vz3UJYcVLOMYMNeCb35H7nXdyB 4F31L9Az50B+5ZWY3CWk9VcrzwwL8GcCH+5xeM6R6QX/OsBkVAe/0GKi1U37ojJJ/MZg 2zlUr2yNcGfoc8MLZgUsDvmG5JfHkdSg6NQM2gHIwetahzc0xEijb6PbeBRGL/RmajD0 o4GA== X-Gm-Message-State: AKaTC01lfayGWoe2Wk9C6Gm2uTNebSr2jemsf4TQxy8zzYEQ9CFH3L2YK+LK51SHOw2ghQ== X-Received: by 10.25.22.73 with SMTP id m70mr9045278lfi.94.1480357650491; Mon, 28 Nov 2016 10:27:30 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id s64sm12742110lfs.38.2016.11.28.10.27.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 10:27:27 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cBQeA-0007Kl-KV; Mon, 28 Nov 2016 19:27:22 +0100 From: Johan Hovold To: "David S. Miller" Cc: Vince Bridgers , Florian Fainelli , Fugang Duan , Pantelis Antoniou , Vitaly Bordug , Claudiu Manoil , Li Yang , Thomas Petazzoni , Felix Fietkau , John Crispin , Matthias Brugger , Sergei Shtylyov , Lars Persson , Mugunthan V N , Grygorii Strashko , Rob Herring , Frank Rowand , Andrew Lunn , Vivien Didelot , netdev@vger.kernel.org, nios2-dev@lists.rocketboards.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH net 10/16] net: ethernet: ucc_geth: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:25:03 +0100 Message-Id: <1480357509-28074-11-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1480357509-28074-1-git-send-email-johan@kernel.org> References: <1480357509-28074-1-git-send-email-johan@kernel.org> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure to deregister and free any fixed-link PHY registered using of_phy_register_fixed_link() on probe errors and on driver unbind. Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers") Signed-off-by: Johan Hovold --- drivers/net/ethernet/freescale/ucc_geth.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index 186ef8f16c80..f76d33279454 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -3868,9 +3868,8 @@ static int ucc_geth_probe(struct platform_device* ofdev) dev = alloc_etherdev(sizeof(*ugeth)); if (dev == NULL) { - of_node_put(ug_info->tbi_node); - of_node_put(ug_info->phy_node); - return -ENOMEM; + err = -ENOMEM; + goto err_deregister_fixed_link; } ugeth = netdev_priv(dev); @@ -3907,10 +3906,7 @@ static int ucc_geth_probe(struct platform_device* ofdev) if (netif_msg_probe(ugeth)) pr_err("%s: Cannot register net device, aborting\n", dev->name); - free_netdev(dev); - of_node_put(ug_info->tbi_node); - of_node_put(ug_info->phy_node); - return err; + goto err_free_netdev; } mac_addr = of_get_mac_address(np); @@ -3923,16 +3919,29 @@ static int ucc_geth_probe(struct platform_device* ofdev) ugeth->node = np; return 0; + +err_free_netdev: + free_netdev(dev); +err_deregister_fixed_link: + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); + of_node_put(ug_info->tbi_node); + of_node_put(ug_info->phy_node); + + return err; } static int ucc_geth_remove(struct platform_device* ofdev) { struct net_device *dev = platform_get_drvdata(ofdev); struct ucc_geth_private *ugeth = netdev_priv(dev); + struct device_node *np = ofdev->dev.of_node; unregister_netdev(dev); free_netdev(dev); ucc_geth_memclean(ugeth); + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); of_node_put(ugeth->ug_info->tbi_node); of_node_put(ugeth->ug_info->phy_node);