mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-launch: Use fstat to make sure we stat the right fd

Browse Source 
Instead of the racy stat+open, open first and then use fstat.  We want to
make sure we're stating the fd we'll be sending to weston and nothing else.
This commit is contained in:
Kristian Høgsberg
2013-09-18 22:14:09 -07:00
parent 81b4963949
commit 6a7c8492cc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/weston-launch.c
+7 -3
View File
@@ -280,9 +280,6 @@ handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
/* Ensure path is null-terminated */ /* Ensure path is null-terminated */
((char *) message)[len-1] = '\0'; ((char *) message)[len-1] = '\0';
if (stat(message->path, &s) < 0)
goto err0;
fd = open(message->path, message->flags); fd = open(message->path, message->flags);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Error opening device %s: %m\n", fprintf(stderr, "Error opening device %s: %m\n",
@@ -290,6 +287,13 @@ handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
goto err0; goto err0;
} }
if (fstat(fd, &s) < 0) {
close(fd);
fd = -1;
fprintf(stderr, "Failed to stat %s\n", message->path);
goto err0;
}
if (major(s.st_rdev) != INPUT_MAJOR && if (major(s.st_rdev) != INPUT_MAJOR &&
major(s.st_rdev) != DRM_MAJOR) { major(s.st_rdev) != DRM_MAJOR) {
close(fd); close(fd);