From b7cc07432ac14b7edfae66fb346c0d164f66e480 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 24 Jul 2017 03:45:03 +0100 Subject: [PATCH] radv: for external memory imports close the fd on import success If we get an fd, we need to close it before returning. Fixes CTS test dEQP-VK.api.external.memory.opaque_fd.dedicated.device_only.import_multiple_times Fixes: b70829708a (radv: Implement VK_KHR_external_memory) Reviewed-by: Jason Ekstrand Signed-off-by: Dave Airlie --- src/amd/vulkan/radv_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 81053ac2164..619e0f2fbe4 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -2253,8 +2253,10 @@ VkResult radv_AllocateMemory( if (!mem->bo) { result = VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR; goto fail; - } else + } else { + close(import_info->fd); goto out_success; + } } uint64_t alloc_size = align_u64(pAllocateInfo->allocationSize, 4096); -- 2.30.2