summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorxypron.glpk@gmx.de <xypron.glpk@gmx.de>2016-05-17 21:40:38 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-19 11:25:30 -0700
commit099a728d5819da80ff9fff3df980ea6e89a01e60 (patch)
treed4c7a801bd98437a3e890e3856eba3b21cf44640 /drivers
parent07b75260ebc2c789724c594d7eaf0194fa47b3be (diff)
downloadblackbird-obmc-linux-099a728d5819da80ff9fff3df980ea6e89a01e60.tar.gz
blackbird-obmc-linux-099a728d5819da80ff9fff3df980ea6e89a01e60.zip
net: thunderx: avoid null pointer dereference
In function bgx_lmac_handler only use a member of lmac after checking it is not null. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Acked-by: David Daney <david.daney@cavium.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/cavium/thunder/thunder_bgx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index d20539a6d162..3ed21988626b 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -274,12 +274,14 @@ static void bgx_sgmii_change_link_state(struct lmac *lmac)
static void bgx_lmac_handler(struct net_device *netdev)
{
struct lmac *lmac = container_of(netdev, struct lmac, netdev);
- struct phy_device *phydev = lmac->phydev;
+ struct phy_device *phydev;
int link_changed = 0;
if (!lmac)
return;
+ phydev = lmac->phydev;
+
if (!phydev->link && lmac->last_link)
link_changed = -1;
OpenPOWER on IntegriCloud