r8169: fix crash if CONFIG_DEBUG_SHIRQ is enabled

hkallweit · davem330 · commit ee28b30cbbe0 · 2018-12-11T22:54:19.000-08:00
If CONFIG_DEBUG_SHIRQ is enabled __free_irq() intentionally fires a spurious interrupt. This interrupt causes a crash because tp->dev->phydev is NULL at that time. Fixes: 38caff5 ("r8169: handle all interrupt events in the hard irq handler") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
@@ -6469,7 +6469,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 		goto out;
 	}
 
-	if (status & LinkChg)
+	if (status & LinkChg && tp->dev->phydev)
 		phy_mac_interrupt(tp->dev->phydev);
 
 	if (unlikely(status & RxFIFOOver &&

Original file line number	Diff line number	Diff line change
`@@ -6469,7 +6469,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)`
`6469`	`6469`	`goto out;`
`6470`	`6470`	`}`
`6471`	`6471`
`6472`		`- if (status & LinkChg)`
	`6472`	`+ if (status & LinkChg && tp->dev->phydev)`
`6473`	`6473`	`phy_mac_interrupt(tp->dev->phydev);`
`6474`	`6474`
`6475`	`6475`	`if (unlikely(status & RxFIFOOver &&`