* [PATCH] cpmac: do not leak struct net_device on phy_connect errors
@ 2010-06-21 8:07 Florian Fainelli
2010-06-27 17:05 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2010-06-21 8:07 UTC (permalink / raw)
To: netdev; +Cc: David Miller
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>
CC: stable@kernel.org
---
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 3c58db5..23786ee 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1181,7 +1181,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
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))) {
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] cpmac: do not leak struct net_device on phy_connect errors
2010-06-21 8:07 [PATCH] cpmac: do not leak struct net_device on phy_connect errors Florian Fainelli
@ 2010-06-27 17:05 ` Florian Fainelli
2010-06-29 4:20 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2010-06-27 17:05 UTC (permalink / raw)
To: netdev; +Cc: David Miller
Hi David,
Forgot to mention that this is relevant for -stable and current net-next-2.6. Thanks!
Le Monday 21 June 2010 10:07:48, Fainelli a écrit :
> 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>
> CC: stable@kernel.org
> ---
> diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
> index 3c58db5..23786ee 100644
> --- a/drivers/net/cpmac.c
> +++ b/drivers/net/cpmac.c
> @@ -1181,7 +1181,8 @@ static int __devinit cpmac_probe(struct
> platform_device *pdev) 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))) {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-29 4:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-21 8:07 [PATCH] cpmac: do not leak struct net_device on phy_connect errors Florian Fainelli
2010-06-27 17:05 ` Florian Fainelli
2010-06-29 4:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).