Skip to content

Commit 0ecfb8d

Browse files
author
Thomas Zimmermann
committed
Revert "drm/virtio: Use dma_buf from GEM object instance"
This reverts commit 415cb45. 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. 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]> Link: https://lore.kernel.org/r/[email protected]
1 parent 15f7776 commit 0ecfb8d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/gpu/drm/virtio/virtgpu_prime.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,16 @@ static void virtgpu_dma_buf_free_obj(struct drm_gem_object *obj)
204204
{
205205
struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
206206
struct virtio_gpu_device *vgdev = obj->dev->dev_private;
207+
struct dma_buf_attachment *attach = obj->import_attach;
207208

208209
if (drm_gem_is_imported(obj)) {
209-
struct dma_buf *dmabuf = obj->dma_buf;
210+
struct dma_buf *dmabuf = attach->dmabuf;
210211

211212
dma_resv_lock(dmabuf->resv, NULL);
212213
virtgpu_dma_buf_unmap(bo);
213214
dma_resv_unlock(dmabuf->resv);
214215

215-
dma_buf_detach(dmabuf, obj->import_attach);
216+
dma_buf_detach(dmabuf, attach);
216217
dma_buf_put(dmabuf);
217218
}
218219

0 commit comments

Comments
 (0)