OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crocus: Fix memory leaks on iris_resource_create failure paths

Browse Source 
We've already allocated the pipe resource, so we ought to free it
before returning.

Fixes: d8a38edc48 ("crocus: fail resource allocation properly.")
Fixes: f3630548f1 ("crocus: initial gallium driver for Intel gfx 4-7")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18311>
(cherry picked from commit 6c7916b7f6)
This commit is contained in:
Kenneth Graunke
2022-04-27 01:35:02 -07:00
committed by Dylan Baker
parent 51cd3f89a1
commit a00e1b3a63
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -7753,7 +7753,7 @@
"description": "crocus: Fix memory leaks on iris_resource_create failure paths", "description": "crocus: Fix memory leaks on iris_resource_create failure paths",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "d8a38edc48e5567e5f0205b7347761e3d05a4bda" "because_sha": "d8a38edc48e5567e5f0205b7347761e3d05a4bda"
}, },

4
src/gallium/drivers/crocus/crocus_resource.c
View File

@@ -695,12 +695,12 @@ crocus_resource_create_with_modifiers(struct pipe_screen *pscreen,
if (templ->usage == PIPE_USAGE_STAGING && if (templ->usage == PIPE_USAGE_STAGING &&
templ->bind == PIPE_BIND_DEPTH_STENCIL && templ->bind == PIPE_BIND_DEPTH_STENCIL &&
devinfo->ver < 6) devinfo->ver < 6)
return NULL; goto fail;
const bool isl_surf_created_successfully = const bool isl_surf_created_successfully =
crocus_resource_configure_main(screen, res, templ, modifier, 0); crocus_resource_configure_main(screen, res, templ, modifier, 0);
if (!isl_surf_created_successfully) if (!isl_surf_created_successfully)
return NULL; goto fail;
const char *name = "miptree"; const char *name = "miptree";