Mesa (master): radv: don't leak DRM devices

Grazvydas Ignotas notaz at kemper.freedesktop.org
Wed May 3 19:15:54 UTC 2017


Module: Mesa
Branch: master
Commit: 8aab792e92d8f7d20a1e34169e8a714291ba1c6f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8aab792e92d8f7d20a1e34169e8a714291ba1c6f

Author: Grazvydas Ignotas <notasas at gmail.com>
Date:   Tue May  2 20:05:07 2017 +0300

radv: don't leak DRM devices

After successful drmGetDevices2() call, drmFreeDevices() needs to be called.

Fixes: 743315f2 "radv: do not open random render node(s)"
Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_device.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 9e66faf7ab..648103d2c7 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -417,9 +417,11 @@ radv_enumerate_devices(struct radv_instance *instance)
 			if (result == VK_SUCCESS)
 				++instance->physicalDeviceCount;
 			else if (result != VK_ERROR_INCOMPATIBLE_DRIVER)
-				return result;
+				break;
 		}
 	}
+	drmFreeDevices(devices, max_devices);
+
 	return result;
 }
 




More information about the mesa-commit mailing list