Skip to content

Commit 6d496e9

Browse files
author
Thomas Zimmermann
committed
Revert "drm/gem-shmem: Use dma_buf from GEM object instance"
This reverts commit 1a148af. 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 2712ca8 commit 6d496e9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/drm_gem_shmem_helper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem,
349349
int ret = 0;
350350

351351
if (drm_gem_is_imported(obj)) {
352-
ret = dma_buf_vmap(obj->dma_buf, map);
352+
ret = dma_buf_vmap(obj->import_attach->dmabuf, map);
353353
} else {
354354
pgprot_t prot = PAGE_KERNEL;
355355

@@ -409,7 +409,7 @@ void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,
409409
struct drm_gem_object *obj = &shmem->base;
410410

411411
if (drm_gem_is_imported(obj)) {
412-
dma_buf_vunmap(obj->dma_buf, map);
412+
dma_buf_vunmap(obj->import_attach->dmabuf, map);
413413
} else {
414414
dma_resv_assert_held(shmem->base.resv);
415415

0 commit comments

Comments
 (0)