diff mbox series

net: fman: Unregister ethernet device on removal

Message ID 20221103182831.2248833-1-sean.anderson@seco.com
State New
Headers
Series net: fman: Unregister ethernet device on removal |

Commit Message

Sean Anderson Nov. 3, 2022, 6:28 p.m. UTC 
  When the mac device gets removed, it leaves behind the ethernet device.
This will result in a segfault next time the ethernet device accesses
mac_dev. Remove the ethernet device when we get removed to prevent
this. This is not completely reversible, since some resources aren't
cleaned up properly, but that can be addressed later.

Fixes: 3933961682a3 ("fsl/fman: Add FMan MAC driver")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
So... why *do* we have a separate device for the ethernet interface?
Can't the mac device just register the netdev itself?

 drivers/net/ethernet/freescale/fman/mac.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Sean Anderson Nov. 3, 2022, 7:07 p.m. UTC | #1 
On 11/3/22 14:28, Sean Anderson wrote:
> When the mac device gets removed, it leaves behind the ethernet device.
> This will result in a segfault next time the ethernet device accesses
> mac_dev. Remove the ethernet device when we get removed to prevent
> this. This is not completely reversible, since some resources aren't
> cleaned up properly, but that can be addressed later.
> 
> Fixes: 3933961682a3 ("fsl/fman: Add FMan MAC driver")
> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
> ---
> So... why *do* we have a separate device for the ethernet interface?
> Can't the mac device just register the netdev itself?
> 
>  drivers/net/ethernet/freescale/fman/mac.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
> index 65df308bad97..13e67f2864be 100644
> --- a/drivers/net/ethernet/freescale/fman/mac.c
> +++ b/drivers/net/ethernet/freescale/fman/mac.c
> @@ -487,12 +487,21 @@ static int mac_probe(struct platform_device *_of_dev)
>  	return err;
>  }
>  
> +static int mac_remove(struct platform_device *pdev)
> +{
> +	struct mac_device *mac_dev = platform_get_drvdata(pdev);
> +
> +	platform_device_unregister(mac_dev->priv->eth_dev);
> +	return 0;
> +}
> +
>  static struct platform_driver mac_driver = {
>  	.driver = {
>  		.name		= KBUILD_MODNAME,
>  		.of_match_table	= mac_match,
>  	},
>  	.probe		= mac_probe,
> +	.remove		= mac_remove,
>  };
>  
>  builtin_platform_driver(mac_driver);

err, this should be [PATCH net]. Sorry, will fix if necessary for a v2.

--Sena
patchwork-bot+netdevbpf@kernel.org Nov. 5, 2022, 3 a.m. UTC | #2 
Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Thu,  3 Nov 2022 14:28:30 -0400 you wrote:
> When the mac device gets removed, it leaves behind the ethernet device.
> This will result in a segfault next time the ethernet device accesses
> mac_dev. Remove the ethernet device when we get removed to prevent
> this. This is not completely reversible, since some resources aren't
> cleaned up properly, but that can be addressed later.
> 
> Fixes: 3933961682a3 ("fsl/fman: Add FMan MAC driver")
> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
> 
> [...]

Here is the summary with links:
  - net: fman: Unregister ethernet device on removal
    https://git.kernel.org/netdev/net/c/b7cbc6740bd6

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 65df308bad97..13e67f2864be 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -487,12 +487,21 @@  static int mac_probe(struct platform_device *_of_dev)
 	return err;
 }
 
+static int mac_remove(struct platform_device *pdev)
+{
+	struct mac_device *mac_dev = platform_get_drvdata(pdev);
+
+	platform_device_unregister(mac_dev->priv->eth_dev);
+	return 0;
+}
+
 static struct platform_driver mac_driver = {
 	.driver = {
 		.name		= KBUILD_MODNAME,
 		.of_match_table	= mac_match,
 	},
 	.probe		= mac_probe,
+	.remove		= mac_remove,
 };
 
 builtin_platform_driver(mac_driver);