summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-03-29 18:23:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-03-29 18:23:44 -0700
commit91481c4ad0e532e8459372fa91306de8c02f2fc1 (patch)
treeed1e793e8cf4ff4954b38e64d6f50055d2fc5c6c /drivers
parent556f1b4874ca87feede736e1b2b4d11bc76f5bb9 (diff)
parente3f88665a78045fe35c7669d2926b8d97b892c11 (diff)
Merge tag 'hsi-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI update from Sebastian Reichel: - ssi_protocol: fix potential use after free after module removal * tag 'hsi-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: HSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hsi/clients/ssi_protocol.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index afe470f3661c..6105ea9a6c6a 100644
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -401,6 +401,7 @@ static void ssip_reset(struct hsi_client *cl)
del_timer(&ssi->rx_wd);
del_timer(&ssi->tx_wd);
del_timer(&ssi->keep_alive);
+ cancel_work_sync(&ssi->work);
ssi->main_state = 0;
ssi->send_state = 0;
ssi->recv_state = 0;