summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Tillman <master.homer@gmail.com>2015-08-24 11:56:13 +0800
committerChristian König <christian.koenig@amd.com>2015-08-24 11:11:20 +0200
commit5c42b5e36a4a02e579ec5dcdc3a95ce58538224c (patch)
tree2938a5b0080f6e8faf8efbac47166494be153290
parent1eba47a76365576447d6346868a074dca24de1bf (diff)
drm: fix the usage after free
For readdir_r(), the next directory entry is returned in caller-allocted buffer (pointered by pent here). https://bugs.freedesktop.org/show_bug.cgi?id=91704 Signed-off-by: Mathias Tillman <master.homer@gmail.com> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
-rw-r--r--xf86drm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xf86drm.c b/xf86drm.c
index 5e029694..a7cc6438 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -2803,11 +2803,12 @@ static char *drmGetMinorNameForFD(int fd, int type)
while (readdir_r(sysdir, pent, &ent) == 0 && ent != NULL) {
if (strncmp(ent->d_name, name, len) == 0) {
+ snprintf(dev_name, sizeof(dev_name), DRM_DIR_NAME "/%s",
+ ent->d_name);
+
free(pent);
closedir(sysdir);
- snprintf(dev_name, sizeof(dev_name), DRM_DIR_NAME "/%s",
- ent->d_name);
return strdup(dev_name);
}
}