Mesa (master): radv: return correct error on invalid handle from vkAllocateMemory

Dave Airlie airlied at kemper.freedesktop.org
Mon Jun 12 23:30:45 UTC 2017


Module: Mesa
Branch: master
Commit: b9e76b0c4473b8f3ec2ac8208e1cd86852b5fb52
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9e76b0c4473b8f3ec2ac8208e1cd86852b5fb52

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jun 13 05:48:40 2017 +1000

radv: return correct error on invalid handle from vkAllocateMemory

Coverity pointed out this was returning uninitialised.

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/radv_device.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 1ea69608a1..427d35769d 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2108,9 +2108,10 @@ VkResult radv_AllocateMemory(
 		       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX);
 		mem->bo = device->ws->buffer_from_fd(device->ws, import_info->fd,
 						     NULL, NULL);
-		if (!mem->bo)
+		if (!mem->bo) {
+			result = VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX;
 			goto fail;
-		else
+		} else
 			goto out_success;
 	}
 




More information about the mesa-commit mailing list