diff options
| author | Stefan Wahren <wahrenst@gmx.net> | 2025-03-09 13:50:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-10 14:39:26 +0200 |
| commit | 1817c4b85011998604e5ff9a80a6e01adb7e7e81 (patch) | |
| tree | 9b2ee3e8f7907d7165f56c0a68fd54bb1d5ca82a /drivers/staging | |
| parent | f3fafa188d96e7cd1c155ec717f908e7361872e0 (diff) | |
| download | linux-1817c4b85011998604e5ff9a80a6e01adb7e7e81.tar.gz linux-1817c4b85011998604e5ff9a80a6e01adb7e7e81.tar.bz2 linux-1817c4b85011998604e5ff9a80a6e01adb7e7e81.zip | |
staging: vchiq_arm: Fix possible NPR of keep-alive thread
[ Upstream commit 3db89bc6d973e2bcaa852f6409c98c228f39a926 ]
In case vchiq_platform_conn_state_changed() is never called or fails before
driver removal, ka_thread won't be a valid pointer to a task_struct. So
do the necessary checks before calling kthread_stop to avoid a crash.
Fixes: 863a756aaf49 ("staging: vc04_services: vchiq_core: Stop kthreads on vchiq module unload")
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Link: https://lore.kernel.org/r/20250309125014.37166-3-wahrenst@gmx.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index ecf6e9635a10..97787002080a 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -1786,7 +1786,8 @@ static void vchiq_remove(struct platform_device *pdev) kthread_stop(mgmt->state.slot_handler_thread); arm_state = vchiq_platform_get_arm_state(&mgmt->state); - kthread_stop(arm_state->ka_thread); + if (!IS_ERR_OR_NULL(arm_state->ka_thread)) + kthread_stop(arm_state->ka_thread); } static struct platform_driver vchiq_driver = { |