From ad111aed2940a0c2645fff7dbebd7985a3e2ee76 Mon Sep 17 00:00:00 2001
From: Iago Toral Quiroga <itoral@igalia.com>
Date: Thu, 17 Oct 2024 08:46:22 +0200
Subject: [PATCH] v3dv: fix leak during device initialization

Fixes: 188f1c6cbe ('v3dv: rewrite device identification')

Reviewed-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31703>
---
 src/broadcom/vulkan/v3dv_device.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index 95fe4b5f790..2f65d821445 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -1443,6 +1443,8 @@ fail:
 static bool
 try_device(const char *path, int *fd, const char *target)
 {
+   drmVersionPtr version = NULL;
+
    *fd = open(path, O_RDWR | O_CLOEXEC);
    if (*fd < 0) {
       fprintf(stderr, "Opening %s failed: %s\n", path, strerror(errno));
@@ -1452,7 +1454,7 @@ try_device(const char *path, int *fd, const char *target)
    if (!target)
       return true;
 
-   drmVersionPtr version = drmGetVersion(*fd);
+   version = drmGetVersion(*fd);
    if (!version) {
       fprintf(stderr, "Retrieving device version failed: %s\n", strerror(errno));
       goto fail;
@@ -1461,9 +1463,11 @@ try_device(const char *path, int *fd, const char *target)
    if (strcmp(version->name, target) != 0)
       goto fail;
 
+   drmFreeVersion(version);
    return true;
 
 fail:
+   drmFreeVersion(version);
    close(*fd);
    *fd = -1;
    return false;