lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 487/800] net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
    Date
    From: Pavel Machek <pavel@denx.de>

    [ Upstream commit bd70957438f0cc4879cbdff8bbc8614bc1cddf49 ]

    Commit 0571a753cb07 cancelled delayed work too late, keeping small
    race. Cancel work sooner to close it completely.

    Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
    Fixes: 0571a753cb07 ("net: pxa168_eth: Fix a potential data race in pxa168_eth_remove")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/marvell/pxa168_eth.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
    index e967867828d8..9b48ae4bac39 100644
    --- a/drivers/net/ethernet/marvell/pxa168_eth.c
    +++ b/drivers/net/ethernet/marvell/pxa168_eth.c
    @@ -1528,6 +1528,7 @@ static int pxa168_eth_remove(struct platform_device *pdev)
    struct net_device *dev = platform_get_drvdata(pdev);
    struct pxa168_eth_private *pep = netdev_priv(dev);

    + cancel_work_sync(&pep->tx_timeout_task);
    if (pep->htpr) {
    dma_free_coherent(pep->dev->dev.parent, HASH_ADDR_TABLE_SIZE,
    pep->htpr, pep->htpr_dma);
    @@ -1539,7 +1540,6 @@ static int pxa168_eth_remove(struct platform_device *pdev)
    clk_disable_unprepare(pep->clk);
    mdiobus_unregister(pep->smi_bus);
    mdiobus_free(pep->smi_bus);
    - cancel_work_sync(&pep->tx_timeout_task);
    unregister_netdev(dev);
    free_netdev(dev);
    return 0;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:10    [W:5.190 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site