Skip to content
Snippets Groups Projects
Commit efcefc71 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/ttm: Fix ttm_bo_move_memcpy() for subclassed struct ttm_resource


The code was making a copy of a struct ttm_resource. However,
recently the struct ttm_resources were allowed to be subclassed and
also were allowed to be malloced, hence the driver could end up assuming
the copy we handed it was subclassed and worse, the original could have
been freed at this point.

Fix this by using the original struct ttm_resource before it is
potentially freed in ttm_bo_move_sync_cleanup()

v2: Base on drm-misc-next-fixes rather than drm-tip.

Reported-by: default avatarBen Skeggs <skeggsb@gmail.com>
Reported-by: default avatarDave Airlie <airlied@gmail.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: <stable@vger.kernel.org>
Fixes: 3bf3710e ("drm/ttm: Add a generic TTM memcpy move for page-based iomem")
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831071536.80636-1-thomas.hellstrom@linux.intel.com
parent bd7ffbc3
No related branches found
No related tags found
No related merge requests found
...@@ -143,7 +143,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, ...@@ -143,7 +143,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
struct ttm_resource *src_mem = bo->resource; struct ttm_resource *src_mem = bo->resource;
struct ttm_resource_manager *src_man = struct ttm_resource_manager *src_man =
ttm_manager_type(bdev, src_mem->mem_type); ttm_manager_type(bdev, src_mem->mem_type);
struct ttm_resource src_copy = *src_mem;
union { union {
struct ttm_kmap_iter_tt tt; struct ttm_kmap_iter_tt tt;
struct ttm_kmap_iter_linear_io io; struct ttm_kmap_iter_linear_io io;
...@@ -173,11 +172,11 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, ...@@ -173,11 +172,11 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
} }
ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter); ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter);
src_copy = *src_mem;
ttm_bo_move_sync_cleanup(bo, dst_mem);
if (!src_iter->ops->maps_tt) if (!src_iter->ops->maps_tt)
ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, &src_copy); ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, src_mem);
ttm_bo_move_sync_cleanup(bo, dst_mem);
out_src_iter: out_src_iter:
if (!dst_iter->ops->maps_tt) if (!dst_iter->ops->maps_tt)
ttm_kmap_iter_linear_io_fini(&_dst_iter.io, bdev, dst_mem); ttm_kmap_iter_linear_io_fini(&_dst_iter.io, bdev, dst_mem);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment