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

blob: Don't valgrind assert for defined memory if we aren't writing.

Browse source 
The VK pipeline cache passes a NULL bytes with a nonzero size to a
NULL-data blob to set up the size of the blob.  In this case, we don't
actually execute the memcpy, so the non-existent "bytes" doesn't need to
have defined contents.  Avoids a valgrind warning:

==972858== Unaddressable byte(s) found during client check request
==972858==    at 0x147F4166: blob_write_bytes (blob.c:165)
==972858==    by 0x147F4166: blob_write_bytes (blob.c:158)
==972858==    by 0x14695FFF: vk_pipeline_cache_object_serialize (vk_pipeline_cache.c:240)
[...]
==972858==  Address 0x0 is not stack'd, malloc'd or (recently) free'd

Fixes: 591da98779 ("vulkan: Add a common VkPipelineCache implementation")
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22617>
(cherry picked from commit ae2784b832)
This commit is contained in:
Emma Anholt 2023-04-20 14:57:41 -07:00 • committed by Eric Engestrom
parent e6d8483846
commit 55dc3b5009
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1219,7 +1219,7 @@
"description": "blob: Don't valgrind assert for defined memory if we aren't writing.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "591da9877900c56434f9e23e0ad0058b118b0be8"
},

6
src/util/blob.c
View file

@ -160,10 +160,10 @@ blob_write_bytes(struct blob *blob, const void *bytes, size_t to_write)
if (! grow_to_fit(blob, to_write))
return false;
VG(VALGRIND_CHECK_MEM_IS_DEFINED(bytes, to_write));
if (blob->data && to_write > 0)
if (blob->data && to_write > 0) {
VG(VALGRIND_CHECK_MEM_IS_DEFINED(bytes, to_write));
memcpy(blob->data + blob->size, bytes, to_write);
}
blob->size += to_write;
return true;