diff options
| author |   Ioana Ciornei <ioana.ciornei@nxp.com> | 2021-01-11 19:18:02 +0200 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-01-13 19:21:51 -0800 |
| commit | 848c1903d35e2eb4fdf8b1a0a6721876e8c88e5d (patch) | |
| tree | 6e64b4f5b6c422064dacaf60527ff69616f86fb3 /drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | |
| parent | dpaa2-eth: add support for Rx VLAN filtering (diff) | |
| download | linux-dev-848c1903d35e2eb4fdf8b1a0a6721876e8c88e5d.tar.xz linux-dev-848c1903d35e2eb4fdf8b1a0a6721876e8c88e5d.zip | |
dpaa2-mac: fix the remove path for non-MAC interfaces
Check if the interface is indeed connected to a MAC before trying to
close the DPMAC object representing it. Without this check we end up
working with a NULL pointer.
Fixes: d87e606373f6 ("dpaa2-mac: export MAC counters even when in TYPE_FIXED")
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/20210111171802.1826324-1-ciorneiioana@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index dd00c5de2115..7cb286e53369 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -4150,6 +4150,9 @@ static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv) if (dpaa2_eth_is_type_phy(priv)) dpaa2_mac_disconnect(priv->mac); + if (!dpaa2_eth_has_mac(priv)) + return; + dpaa2_mac_close(priv->mac); kfree(priv->mac); priv->mac = NULL; |