* [PATCH] smsc9420: prevent BUG() if ethtool is called with interface down
@ 2009-11-25 16:21 Steve Glendinning
2009-11-30 7:15 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Steve Glendinning @ 2009-11-25 16:21 UTC (permalink / raw)
To: netdev; +Cc: Steve Glendinning
This patch fixes a null pointer dereference BUG() if ethtool is used on
an smsc9420 interface while it is down, because the phy_dev is only
allocated while the interface is up.
Please also consider for -stable.
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
---
drivers/net/smsc9420.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 92e2bbe..12f0f5d 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -252,6 +252,9 @@ static int smsc9420_ethtool_get_settings(struct net_device *dev,
{
struct smsc9420_pdata *pd = netdev_priv(dev);
+ if (!pd->phy_dev)
+ return -ENODEV;
+
cmd->maxtxpkt = 1;
cmd->maxrxpkt = 1;
return phy_ethtool_gset(pd->phy_dev, cmd);
@@ -262,6 +265,9 @@ static int smsc9420_ethtool_set_settings(struct net_device *dev,
{
struct smsc9420_pdata *pd = netdev_priv(dev);
+ if (!pd->phy_dev)
+ return -ENODEV;
+
return phy_ethtool_sset(pd->phy_dev, cmd);
}
@@ -290,6 +296,10 @@ static void smsc9420_ethtool_set_msglevel(struct net_device *netdev, u32 data)
static int smsc9420_ethtool_nway_reset(struct net_device *netdev)
{
struct smsc9420_pdata *pd = netdev_priv(netdev);
+
+ if (!pd->phy_dev)
+ return -ENODEV;
+
return phy_start_aneg(pd->phy_dev);
}
@@ -312,6 +322,10 @@ smsc9420_ethtool_getregs(struct net_device *dev, struct ethtool_regs *regs,
for (i = 0; i < 0x100; i += (sizeof(u32)))
data[j++] = smsc9420_reg_read(pd, i);
+ // cannot read phy registers if the net device is down
+ if (!phy_dev)
+ return;
+
for (i = 0; i <= 31; i++)
data[j++] = smsc9420_mii_read(phy_dev->bus, phy_dev->addr, i);
}
--
1.6.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] smsc9420: prevent BUG() if ethtool is called with interface down
2009-11-25 16:21 [PATCH] smsc9420: prevent BUG() if ethtool is called with interface down Steve Glendinning
@ 2009-11-30 7:15 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-11-30 7:15 UTC (permalink / raw)
To: steve.glendinning; +Cc: netdev
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Wed, 25 Nov 2009 16:21:56 +0000
> This patch fixes a null pointer dereference BUG() if ethtool is used on
> an smsc9420 interface while it is down, because the phy_dev is only
> allocated while the interface is up.
>
> Please also consider for -stable.
>
> Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-30 7:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-25 16:21 [PATCH] smsc9420: prevent BUG() if ethtool is called with interface down Steve Glendinning
2009-11-30 7:15 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.