openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-11-27 17:33:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix use-after-free in loader_add_layer_properties

Browse Source 
Occurs after file_vers is freed and when the layer manifest has a layers field
but has a version of 1.0.0.
This commit is contained in:
Charles Giessen 2022-06-20 15:53:25 -05:00 committed by Charles Giessen
parent 1f92bbb656
commit 8d3d6d4e16
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
loader/loader.c
View File

@ -2553,6 +2553,7 @@ static VkResult loader_add_layer_properties(const struct loader_instance *inst,
VkResult result = VK_ERROR_INITIALIZATION_FAILED;
cJSON *item, *layers_node, *layer_node;
loader_api_version json_version = {0, 0, 0};
char *file_vers = NULL;
// Make sure sure the top level json value is an object
if (!json || json->type != 6) {
goto out;
@ -2561,7 +2562,7 @@ static VkResult loader_add_layer_properties(const struct loader_instance *inst,
if (item == NULL) {
goto out;
}
char *file_vers = cJSON_PrintUnformatted(item);
file_vers = cJSON_PrintUnformatted(item);
if (NULL == file_vers) {
goto out;
}
@ -2574,7 +2575,6 @@ static VkResult loader_add_layer_properties(const struct loader_instance *inst,
"loader_add_layer_properties: %s has unknown layer manifest file version %d.%d.%d. May cause errors.", filename,
json_version.major, json_version.minor, json_version.patch);
}
loader_instance_heap_free(inst, file_vers);
// If "layers" is present, read in the array of layer objects
layers_node = cJSON_GetObjectItem(json, "layers");
@ -2633,6 +2633,9 @@ static VkResult loader_add_layer_properties(const struct loader_instance *inst,
}
out:
if (NULL != file_vers) {
loader_instance_heap_free(inst, file_vers);
}
return result;
}