net: alx: fix race condition in alx_remove
Subsystems (3)
PATCH 1/1 net: alx: fix race condition in alx_remove
There is a race condition exist during termination. The path is alx_stop and then alx_remove. An alx_schedule_link_check could be called before alx_stop and invoke alx_link_check later. Alx_stop frees the napis, and alx_remove cancels any pending works. If any of the work is scheduled before termination and invoked before alx_remove, a null-ptr-deref occurs because both expect alx->napis[i].
This patch fix the race condition by moving cancel_work_sync functions before alx_free_napis inside alx_stop.
--- drivers/net/ethernet/atheros/alx/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/atheros/alx/main.c +3 -3
@@ -1249,6 +1249,9 @@ static int __alx_open(struct alx_priv *alx, bool resume)static void __alx_stop (struct alx_priv *alx) { +cancel_work_sync (&alx->link_check_wk); +cancel_work_sync (&alx->reset_wk); +alx_halt (alx);alx_free_irq (alx);alx_free_rings (alx);
@@ -1855,9 +1858,6 @@ static void alx_remove(struct pci_dev *pdev)struct alx_priv *alx =pci_get_drvdata (pdev);struct alx_hw *hw = &alx->hw; -cancel_work_sync (&alx->link_check_wk); -cancel_work_sync (&alx->reset_wk); -/* restore permanent mac address */ alx_set_macaddr (hw, hw->perm_addr);
Signature · 1 line
2.17.1
PATCH v2 1/1 net: alx: fix race condition in alx_remove
There is a race condition exist during termination. The path is alx_stop and then alx_remove. An alx_schedule_link_check could be called before alx_stop by interrupt handler and invoke alx_link_check later. Alx_stop frees the napis, and alx_remove cancels any pending works. If any of the work is scheduled before termination and invoked before alx_remove, a null-ptr-deref occurs because both expect alx->napis[i].
This patch fix the race condition by moving cancel_work_sync functions before alx_free_napis inside alx_stop. Because interrupt handler can call alx_schedule_link_check again, alx_free_irq is moved before cancel_work_sync calls too.
---
Changes in v2:
- move alx_free_irq before cancel_work_sync calls
- prevent another interrupt to cause race condition
drivers/net/ethernet/atheros/alx/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/atheros/alx/main.c +5 -4
@@ -1249,8 +1249,12 @@ static int __alx_open(struct alx_priv *alx, bool resume)static void __alx_stop (struct alx_priv *alx) { -alx_halt (alx);alx_free_irq (alx); + +cancel_work_sync (&alx->link_check_wk); +cancel_work_sync (&alx->reset_wk); + +alx_halt (alx);alx_free_rings (alx);alx_free_napis (alx); }
@@ -1855,9 +1859,6 @@ static void alx_remove(struct pci_dev *pdev)struct alx_priv *alx =pci_get_drvdata (pdev);struct alx_hw *hw = &alx->hw; -cancel_work_sync (&alx->link_check_wk); -cancel_work_sync (&alx->reset_wk); -/* restore permanent mac address */ alx_set_macaddr (hw, hw->perm_addr);
Signature · 1 line
2.17.1
From: Zekun Shen <[email protected]>
Date: Mon, 15 Jun 2020 11:50:29 -0400
Quoted 7 lines
There is a race condition exist during termination. The path is
alx_stopand thenalx_remove. Analx_schedule_link_checkcould be called beforealx_stopby interrupt handler and invokealx_link_checklater.Alx_stopfrees the napis, andalx_removecancels any pending works. If any of the work is scheduled before termination and invoked beforealx_remove, a null-ptr-deref occurs because both expect alx->napis[i].
Quoted 6 lines
This patch fix the race condition by moving
cancel_work_syncfunctions beforealx_free_napisinsidealx_stop. Because interrupt handler can callalx_schedule_link_checkagain,alx_free_irqis moved beforecancel_work_synccalls too.Signed-off-by Zekun Shen <[email protected]>
Applied, thank you.