fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

virgl: Allocate qdws after virgl_init_context to avoid leak.

Browse source 
Fix defect reported by Coverity Scan.

Resource leak (RESOURCE_LEAK)
leaked_storage: Variable qdws going out of scope leaks the storage it
points to.

Fixes: 9a7d6a110e ("virgl/drm: explicit context initialization")
Suggested-by: Gert Wollny <gert.wollny@collabora.com>
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13609>
(cherry picked from commit 4a38ed822a)
This commit is contained in:
Vinson Lee 2021-10-30 15:12:00 -07:00 • committed by Eric Engestrom
parent 764e965f37
commit a728b8a732
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1696,7 +1696,7 @@
"description": "virgl: Allocate qdws after virgl_init_context to avoid leak.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "9a7d6a110e2a407ead13d0eb2f1aedbdb54e696b"
},

8
src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
View file

@ -1220,16 +1220,16 @@ virgl_drm_winsys_create(int drmFD)
if (drm_version < 0)
return NULL;
qdws = CALLOC_STRUCT(virgl_drm_winsys);
if (!qdws)
return NULL;
if (params[param_context_init].value) {
ret = virgl_init_context(drmFD);
if (ret)
return NULL;
}
qdws = CALLOC_STRUCT(virgl_drm_winsys);
if (!qdws)
return NULL;
qdws->fd = drmFD;
virgl_resource_cache_init(&qdws->cache, CACHE_TIMEOUT_USEC,
virgl_drm_resource_cache_entry_is_busy,