Skip to content

Commit 03cc8f9

Browse files
hodgesdsjmberg-intel
authored andcommitted
wifi: libertas: fix use-after-free in lbs_free_adapter()
The lbs_free_adapter() function uses timer_delete() (non-synchronous) for both command_timer and tx_lockup_timer before the structure is freed. This is incorrect because timer_delete() does not wait for any running timer callback to complete. If a timer callback is executing when lbs_free_adapter() is called, the callback will access freed memory since lbs_cfg_free() frees the containing structure immediately after lbs_free_adapter() returns. Both timer callbacks (lbs_cmd_timeout_handler and lbs_tx_lockup_handler) access priv->driver_lock, priv->cur_cmd, priv->dev, and other fields, which would all be use-after-free violations. Use timer_delete_sync() instead to ensure any running timer callback has completed before returning. This bug was introduced in commit 8f641d9 ("libertas: detect TX lockups and reset hardware") where del_timer() was used instead of del_timer_sync() in the cleanup path. The command_timer has had the same issue since the driver was first written. Fixes: 8f641d9 ("libertas: detect TX lockups and reset hardware") Fixes: 954ee16 ("[PATCH] libertas: reorganize and simplify init sequence") Cc: [email protected] Signed-off-by: Daniel Hodges <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 2572345 commit 03cc8f9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • drivers/net/wireless/marvell/libertas

drivers/net/wireless/marvell/libertas/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -799,8 +799,8 @@ static void lbs_free_adapter(struct lbs_private *priv)
799799
{
800800
lbs_free_cmd_buffer(priv);
801801
kfifo_free(&priv->event_fifo);
802-
timer_delete(&priv->command_timer);
803-
timer_delete(&priv->tx_lockup_timer);
802+
timer_delete_sync(&priv->command_timer);
803+
timer_delete_sync(&priv->tx_lockup_timer);
804804
}
805805

806806
static const struct net_device_ops lbs_netdev_ops = {

0 commit comments

Comments
 (0)