From: Christian König Date: Mon, 19 Sep 2022 12:00:33 +0000 (+0200) Subject: dma-buf: fix dma_fence_default_wait() signaling check X-Git-Tag: v6.1-rc1~159^2~5^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cc3dd73c420dc70cd366f91a680035ef47edf4f;p=thirdparty%2Fkernel%2Flinux.git dma-buf: fix dma_fence_default_wait() signaling check That check must now come after grabing the spinlock, not before. Signed-off-by: Christian König Fixes: b96fb1e724ae ("dma-buf: dma_fence_wait must enable signaling") Acked-by: Alex Deucher Link: https://patchwork.freedesktop.org/patch/msgid/20220919120618.113332-1-christian.koenig@amd.com --- diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index a5fbf1c1e0ea2..406b4e26f538f 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -763,11 +763,11 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout) unsigned long flags; signed long ret = timeout ? timeout : 1; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) - return ret; - spin_lock_irqsave(fence->lock, flags); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) + goto out; + if (intr && signal_pending(current)) { ret = -ERESTARTSYS; goto out;