Mesa (master): loader: Fix leak of kernel driver name
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jan 30 18:47:59 UTC 2020
Module: Mesa
Branch: master
Commit: 594cb3035615b3a6cf3dc09ccee30554b56eb2f3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=594cb3035615b3a6cf3dc09ccee30554b56eb2f3
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Jan 29 07:50:16 2020 -0800
loader: Fix leak of kernel driver name
This is strdup'd, it needs to be freed.
CID: 1458032
Fixes: f93bb2fb102 ("loader: Check if the kernel driver is i915 before loading iris")
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Sagar Ghuge <sagar.ghuge at intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3630>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3630>
---
src/loader/loader.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/loader/loader.c b/src/loader/loader.c
index a2fe0a241a2..c896fdc3360 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -118,7 +118,10 @@ bool
is_kernel_i915(int fd)
{
char *kernel_driver = loader_get_kernel_driver_name(fd);
- return kernel_driver && strcmp(kernel_driver, "i915") == 0;
+ bool is_i915 = kernel_driver && strcmp(kernel_driver, "i915") == 0;
+
+ free(kernel_driver);
+ return is_i915;
}
#if defined(HAVE_LIBDRM)
More information about the mesa-commit
mailing list