fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vk/allocator: Avoid double-free in the bo pool

Browse source
This commit is contained in:
Jason Ekstrand 2015-06-05 17:11:49 -07:00
parent aa523d3c62
commit ed2ca020f8
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vulkan/allocator.c
View file

@ -663,6 +663,13 @@ anv_bo_pool_finish(struct anv_bo_pool *pool)
struct bo_pool_bo_link *link = PFL_PTR(pool->free_list);
while (link != NULL) {
struct bo_pool_bo_link link_copy = VG_NOACCESS_READ(link);
/* The anv_gem_m[un]map() functions are also valgrind-safe so they
* act as an alloc/free. In order to avoid a double-free warning, we
* need to mark thiss as malloc'd before we unmap it.
*/
VG(VALGRIND_MALLOCLIKE_BLOCK(link_copy.bo.map, pool->bo_size, 0, false));
anv_gem_munmap(link_copy.bo.map, pool->bo_size);
anv_gem_close(pool->device, link_copy.bo.gem_handle);
link = link_copy.next;
@ -700,10 +707,10 @@ anv_bo_pool_alloc(struct anv_bo_pool *pool, struct anv_bo *bo)
return vk_error(VK_ERROR_MEMORY_MAP_FAILED);
}
/* We don't need to call VALGRIND_MALLOCLIKE_BLOCK here because valgrind
* already picks up on the gem_mmap and treats that as a malloc. If we
* really want to be pedantic we could do a VALGRIND_FREELIKE_BLOCK
* right after the mmap, but there's no good reason.
/* We don't need to call VALGRIND_MALLOCLIKE_BLOCK here because gem_mmap
* calls it for us. If we really want to be pedantic we could do a
* VALGRIND_FREELIKE_BLOCK right after the mmap, but there's no good
* reason.
*/
*bo = new_bo;