lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[029/205] cpmac: do not leak struct net_device on phy_connect errors
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Florian Fainelli <florian@openwrt.org>

    commit ed770f01360b392564650bf1553ce723fa46afec upstream.

    If the call to phy_connect fails, we will return directly instead of freeing
    the previously allocated struct net_device.

    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/cpmac.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/cpmac.c
    +++ b/drivers/net/cpmac.c
    @@ -1182,7 +1182,8 @@ static int __devinit cpmac_probe(struct
    if (netif_msg_drv(priv))
    printk(KERN_ERR "%s: Could not attach to PHY\n",
    dev->name);
    - return PTR_ERR(priv->phy);
    + rc = PTR_ERR(priv->phy);
    + goto fail;
    }

    if ((rc = register_netdev(dev))) {



    \
     
     \ /
      Last update: 2010-07-30 20:41    [W:0.020 / U:2.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site