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

egl: fix memory leak related to _eglRefreshDeviceList()

Browse source 
Indeed, the unnecessary drmDevice objects were not freed.

For instance, this issue could be triggered with: "piglit/bin/egl_ext_platform_device -auto -fbo":
SUMMARY: AddressSanitizer: 2796 byte(s) leaked in 12 allocation(s).

Fixes: e39d72aec2 ("egl: only take render nodes into account when listing DRM devices")
Signed-off-by: Patrick Lerda <patrick9876@free.fr>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22408>
(cherry picked from commit f9401a515a)
This commit is contained in:
Patrick Lerda 2023-04-07 18:03:58 +02:00 • committed by Dylan Baker
parent 41bab238dc
commit 0c85cb051f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4574,7 +4574,7 @@
"description": "egl: fix memory leak related to _eglRefreshDeviceList()",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "e39d72aec203ee317feb87ba1c8953a99aad2a5c",
"notes": null

4
src/egl/main/egldevice.c
View file

@ -300,8 +300,10 @@ _eglRefreshDeviceList(void)
num_devs = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
for (int i = 0; i < num_devs; i++) {
if (!(devices[i]->available_nodes & (1 << DRM_NODE_RENDER)))
if (!(devices[i]->available_nodes & (1 << DRM_NODE_RENDER))) {
drmFreeDevice(&devices[i]);
continue;
}
ret = _eglAddDRMDevice(devices[i], NULL);