From ad19b0714a8d3cb51121b09b6e3915439d5f3452 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 3 Dec 2020 16:03:15 +0100 Subject: [PATCH] radv: fix access to uninitialized radeon_bo_metadata If the image tiling is set to VK_IMAGE_TILING_LINEAR, buffer_set_metadata will read an uninitialized radeon_bo_metadata. Signed-off-by: Simon Ser Fixes: d5fd8cd46eee ("radv: Allow non-dedicated linear images and buffer.") Cc: mesa-stable Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a403243b1b3..4e79e04e987 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -5145,9 +5145,8 @@ bool radv_get_memory_fd(struct radv_device *device, { struct radeon_bo_metadata metadata; - if (memory->image) { - if (memory->image->tiling != VK_IMAGE_TILING_LINEAR) - radv_init_metadata(device, memory->image, &metadata); + if (memory->image && memory->image->tiling != VK_IMAGE_TILING_LINEAR) { + radv_init_metadata(device, memory->image, &metadata); device->ws->buffer_set_metadata(memory->bo, &metadata); }