]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gpu: host1x: Fix race in syncpt alloc/free
authorMainak Sen <msen@nvidia.com>
Mon, 7 Jul 2025 09:17:39 +0000 (18:17 +0900)
committerThierry Reding <treding@nvidia.com>
Thu, 11 Sep 2025 16:56:32 +0000 (18:56 +0200)
Fix race condition between host1x_syncpt_alloc()
and host1x_syncpt_put() by using kref_put_mutex()
instead of kref_put() + manual mutex locking.

This ensures no thread can acquire the
syncpt_mutex after the refcount drops to zero
but before syncpt_release acquires it.
This prevents races where syncpoints could
be allocated while still being cleaned up
from a previous release.

Remove explicit mutex locking in syncpt_release
as kref_put_mutex() handles this atomically.

Signed-off-by: Mainak Sen <msen@nvidia.com>
Fixes: f5ba33fb9690 ("gpu: host1x: Reserve VBLANK syncpoints at initialization")
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20250707-host1x-syncpt-race-fix-v1-1-28b0776e70bc@nvidia.com
drivers/gpu/host1x/syncpt.c

index f63d14a57a1d950daa1a5864613d7f2fe4d04aa9..acc7d82e0585e83db2da82933ada4c817114b16e 100644 (file)
@@ -345,8 +345,6 @@ static void syncpt_release(struct kref *ref)
 
        sp->locked = false;
 
-       mutex_lock(&sp->host->syncpt_mutex);
-
        host1x_syncpt_base_free(sp->base);
        kfree(sp->name);
        sp->base = NULL;
@@ -369,7 +367,7 @@ void host1x_syncpt_put(struct host1x_syncpt *sp)
        if (!sp)
                return;
 
-       kref_put(&sp->ref, syncpt_release);
+       kref_put_mutex(&sp->ref, syncpt_release, &sp->host->syncpt_mutex);
 }
 EXPORT_SYMBOL(host1x_syncpt_put);