From: Dave Airlie <airlied@redhat.com>
Date: Mon, 12 Jun 2017 19:48:40 +0000 (+1000)
Subject: radv: return correct error on invalid handle from vkAllocateMemory
X-Git-Tag: upstream/18.1.0~8892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9e76b0c4473b8f3ec2ac8208e1cd86852b5fb52;p=platform%2Fupstream%2Fmesa.git

radv: return correct error on invalid handle from vkAllocateMemory

Coverity pointed out this was returning uninitialised.

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

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 1ea6960..427d357 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;
 	}