diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-03-31 15:17:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-31 10:09:07 -0700 |
| commit | 765bda93d043c7c0c15305a916e0fa553fdd9964 (patch) | |
| tree | 3647c403a61d1c3fc8e48fe03b473381d408019c /net/dsa | |
| parent | 41c55ea6c2a7ca4c663eeec05bdf54f4e2419699 (diff) | |
| download | linux-stable-765bda93d043c7c0c15305a916e0fa553fdd9964.tar.gz linux-stable-765bda93d043c7c0c15305a916e0fa553fdd9964.tar.bz2 linux-stable-765bda93d043c7c0c15305a916e0fa553fdd9964.zip | |
net: dsa: fix oops while probing Marvell DSA switches
Fix an oops in dsa_port_phylink_mac_change() caused by a combination
of a20f997010c4 ("net: dsa: Don't instantiate phylink for CPU/DSA
ports unless needed") and the net-dsa-improve-serdes-integration
series of patches 65b7a2c8e369 ("Merge branch
'net-dsa-improve-serdes-integration'").
Unable to handle kernel NULL pointer dereference at virtual address 00000124
pgd = c0004000
[00000124] *pgd=00000000
Internal error: Oops: 805 [#1] SMP ARM
Modules linked in: tag_edsa spi_nor mtd xhci_plat_hcd mv88e6xxx(+) xhci_hcd armada_thermal marvell_cesa dsa_core ehci_orion libdes phy_armada38x_comphy at24 mcp3021 sfp evbug spi_orion sff mdio_i2c
CPU: 1 PID: 214 Comm: irq/55-mv88e6xx Not tainted 5.6.0+ #470
Hardware name: Marvell Armada 380/385 (Device Tree)
PC is at phylink_mac_change+0x10/0x88
LR is at mv88e6352_serdes_irq_status+0x74/0x94 [mv88e6xxx]
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 9692a726f2ed..5390ff541658 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1585,7 +1585,8 @@ void dsa_port_phylink_mac_change(struct dsa_switch *ds, int port, bool up) { const struct dsa_port *dp = dsa_to_port(ds, port); - phylink_mac_change(dp->pl, up); + if (dp->pl) + phylink_mac_change(dp->pl, up); } EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_change); |