fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/runtime: fix accessing NULL pointers detected by UBSAN

Browse source 
Fixes: 7a84314c12 ("vulkan/runtime: Add sparse bind support.")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14619>
This commit is contained in:
Samuel Pitoiset 2022-01-19 14:37:54 +01:00 • committed by Marge Bot
parent 44ddc28fa8
commit 6619f855d9
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vulkan/runtime/vk_queue.c
View file

@ -668,7 +668,9 @@ vk_queue_submit(struct vk_queue *queue,
sparse_memory_bind_entry_count = 0;
sparse_memory_image_bind_entry_count = 0;
typed_memcpy(submit->buffer_binds, info->buffer_binds, info->buffer_bind_count);
if (info->buffer_binds)
typed_memcpy(submit->buffer_binds, info->buffer_binds, info->buffer_bind_count);
for (uint32_t i = 0; i < info->buffer_bind_count; ++i) {
VkSparseMemoryBind *binds = sparse_memory_bind_entries +
sparse_memory_bind_entry_count;
@ -679,8 +681,10 @@ vk_queue_submit(struct vk_queue *queue,
sparse_memory_bind_entry_count += info->buffer_binds[i].bindCount;
}
typed_memcpy(submit->image_opaque_binds, info->image_opaque_binds,
info->image_opaque_bind_count);
if (info->image_opaque_binds)
typed_memcpy(submit->image_opaque_binds, info->image_opaque_binds,
info->image_opaque_bind_count);
for (uint32_t i = 0; i < info->image_opaque_bind_count; ++i) {
VkSparseMemoryBind *binds = sparse_memory_bind_entries +
sparse_memory_bind_entry_count;
@ -691,7 +695,9 @@ vk_queue_submit(struct vk_queue *queue,
sparse_memory_bind_entry_count += info->image_opaque_binds[i].bindCount;
}
typed_memcpy(submit->image_binds, info->image_binds, info->image_bind_count);
if (info->image_binds)
typed_memcpy(submit->image_binds, info->image_binds, info->image_bind_count);
for (uint32_t i = 0; i < info->image_bind_count; ++i) {
VkSparseImageMemoryBind *binds = sparse_memory_image_bind_entries +
sparse_memory_image_bind_entry_count;