From 8604d588776fc92cb79f8c8cf4a45bccdb69a33c Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 12 May 2023 00:47:54 -0700 Subject: [PATCH] lvp: avoid accessing member of NULL ptr for global entries Cc: mesa-stable Signed-off-by: Yiwei Zhang Reviewed-by: Mike Blumenkrantz Part-of: (cherry picked from commit aa57e8ef18e452b6ff7bd1dff99bc784ccce8818) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 82cf9489ec4..7cca6248238 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3874,7 +3874,7 @@ "description": "lvp: avoid accessing member of NULL ptr for global entries", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 78ba5266d72..ed2cf868620 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -1472,8 +1472,8 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL lvp_GetInstanceProcAddr( VkInstance _instance, const char* pName) { - LVP_FROM_HANDLE(lvp_instance, instance, _instance); - return vk_instance_get_proc_addr(&instance->vk, + VK_FROM_HANDLE(vk_instance, instance, _instance); + return vk_instance_get_proc_addr(instance, &lvp_instance_entrypoints, pName); }