Skip to content

Commit 1918e79

Browse files
author
Thomas Zimmermann
committed
Revert "drm/gem-dma: Use dma_buf from GEM object instance"
This reverts commit e8afa15. The dma_buf field in struct drm_gem_object is not stable over the object instance's lifetime. The field becomes NULL when user space releases the final GEM handle on the buffer object. This resulted in a NULL-pointer deref. Workarounds in commit 5307dce ("drm/gem: Acquire references on GEM handles for framebuffers") and commit f6bfc9a ("drm/framebuffer: Acquire internal references on GEM handles") only solved the problem partially. They especially don't work for buffer objects without a DRM framebuffer associated. Hence, this revert to going back to using .import_attach->dmabuf. v3: - cc stable Signed-off-by: Thomas Zimmermann <[email protected]> Reviewed-by: Simona Vetter <[email protected]> Acked-by: Christian König <[email protected]> Acked-by: Zack Rusin <[email protected]> Cc: <[email protected]> # v6.15+ Link: https://lore.kernel.org/r/[email protected]
1 parent 6d496e9 commit 1918e79

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/drm_gem_dma_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj)
230230

231231
if (drm_gem_is_imported(gem_obj)) {
232232
if (dma_obj->vaddr)
233-
dma_buf_vunmap_unlocked(gem_obj->dma_buf, &map);
233+
dma_buf_vunmap_unlocked(gem_obj->import_attach->dmabuf, &map);
234234
drm_prime_gem_destroy(gem_obj, dma_obj->sgt);
235235
} else if (dma_obj->vaddr) {
236236
if (dma_obj->map_noncoherent)

0 commit comments

Comments
 (0)