]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dma-buf: insert memory barrier before updating num_fences
authorHyejeong Choi <hjeong.choi@samsung.com>
Tue, 13 May 2025 02:06:38 +0000 (21:06 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 May 2025 12:10:04 +0000 (14:10 +0200)
commit 72c7d62583ebce7baeb61acce6057c361f73be4a upstream.

smp_store_mb() inserts memory barrier after storing operation.
It is different with what the comment is originally aiming so Null
pointer dereference can be happened if memory update is reordered.

Signed-off-by: Hyejeong Choi <hjeong.choi@samsung.com>
Fixes: a590d0fdbaa5 ("dma-buf: Update reservation shared_count after adding the new fence")
CC: stable@vger.kernel.org
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20250513020638.GA2329653@au1-maretx-p37.eng.sarc.samsung.com
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/dma-buf/dma-resv.c

index e78ff9333c7a3916b869af20bae88d3b472e83f0..759b4f80baeebcb98a8997632520e1a535f2906d 100644 (file)
@@ -308,8 +308,9 @@ void dma_resv_add_fence(struct dma_resv *obj, struct dma_fence *fence,
        count++;
 
        dma_resv_list_set(fobj, i, fence, usage);
-       /* pointer update must be visible before we extend the num_fences */
-       smp_store_mb(fobj->num_fences, count);
+       /* fence update must be visible before we extend the num_fences */
+       smp_wmb();
+       fobj->num_fences = count;
 }
 EXPORT_SYMBOL(dma_resv_add_fence);