Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Only check file type bits not mode when searching for rendernodes 

Before checking st_rdev, we first need to validate that the file is a
device node, but we only want to check the file type bits and not
compare the permissions.

Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2018-02-08 17:20:55 +00:00
parent 2d6af9e736
commit 5c7e4e0e05
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/intel_device.c
View File

@ -467,7 +467,7 @@ static char *find_master_node(int fd)
sprintf(buf, "/dev/dri/card%d", (int)(st.st_rdev & 0x7f));
if (stat(buf, &master) == 0 &&
st.st_mode == master.st_mode &&
S_ISCHR(master.st_mode) &&
(st.st_rdev & 0x7f) == master.st_rdev)
return strdup(buf);
@ -478,10 +478,10 @@ static char *find_master_node(int fd)
static int is_render_node(int fd, struct stat *st)
{
if (fstat(fd, st))
return 0;
return -1;
if (!S_ISCHR(st->st_mode))
return 0;
return -1;
return st->st_rdev & 0x80;
}
@ -498,7 +498,7 @@ static char *find_render_node(int fd)
sprintf(buf, "/dev/dri/renderD%d", (int)((master.st_rdev | 0x80) & 0xbf));
if (stat(buf, &render) == 0 &&
master.st_mode == render.st_mode &&
S_ISCHR(render.st_mode) &&
render.st_rdev == (master.st_rdev | 0x80))
return strdup(buf);
@ -506,7 +506,7 @@ static char *find_render_node(int fd)
for (i = 0; i < 16; i++) {
sprintf(buf, "/dev/dri/renderD%d", i + 128);
if (stat(buf, &render) == 0 &&
master.st_mode == render.st_mode &&
S_ISCHR(render.st_mode) &&
render.st_rdev == (master.st_rdev | 0x80))
return strdup(buf);
}