From 1aab9bc3f006d9d0b70d3c5332384e510823fdd3 Mon Sep 17 00:00:00 2001 From: Friedrich Vock Date: Tue, 30 Jan 2024 15:48:52 +0100 Subject: [PATCH] vulkan: Use secure_getenv for trigger files Reviewed-by: Eric Engestrom Cc: mesa-stable Part-of: (cherry picked from commit 7ea96ff75b771ea8eb48d2b9fec05e5edc958b21) --- .pick_status.json | 2 +- src/vulkan/runtime/vk_instance.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6c88cc4882e..e32bc4cfadd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -94,7 +94,7 @@ "description": "vulkan: Use secure_getenv for trigger files", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/vulkan/runtime/vk_instance.c b/src/vulkan/runtime/vk_instance.c index 31dc8b1ff69..f375c16f365 100644 --- a/src/vulkan/runtime/vk_instance.c +++ b/src/vulkan/runtime/vk_instance.c @@ -197,7 +197,7 @@ vk_instance_init(struct vk_instance *instance, instance->trace_mode = parse_debug_string(getenv("MESA_VK_TRACE"), trace_options); instance->trace_frame = (uint32_t)debug_get_num_option("MESA_VK_TRACE_FRAME", 0xFFFFFFFF); - instance->trace_trigger_file = getenv("MESA_VK_TRACE_TRIGGER"); + instance->trace_trigger_file = secure_getenv("MESA_VK_TRACE_TRIGGER"); vk_compiler_cache_init();