frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os, shm: fcntl()'s third argument is integer, not pointer 

All of these uses were attempting to set FD_CLOEXEC, which happens to be
(1<<0). Since flags is going to be aligned in memory, its address is
never going to have the low bit set, so we were never actually setting
what we meant to.

Fixes: xorg/xserver#1114
This commit is contained in:
Adam Jackson 2020-12-18 09:36:30 -05:00
parent 5e3900904d
commit 365cbbfc4b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/shm.c
View File

@ -1248,7 +1248,7 @@ shm_tmpfile(void)
int flags = fcntl(fd, F_GETFD); int flags = fcntl(fd, F_GETFD);
if (flags != -1) { if (flags != -1) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
(void) fcntl(fd, F_SETFD, &flags); (void) fcntl(fd, F_SETFD, flags);
} }
#endif #endif
return fd; return fd;

4
os/inputthread.c
View File

@ -427,7 +427,7 @@ InputThreadPreInit(void)
flags = fcntl(inputThreadInfo->readPipe, F_GETFD); flags = fcntl(inputThreadInfo->readPipe, F_GETFD);
if (flags != -1) { if (flags != -1) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
(void)fcntl(inputThreadInfo->readPipe, F_SETFD, &flags); (void)fcntl(inputThreadInfo->readPipe, F_SETFD, flags);
} }
SetNotifyFd(inputThreadInfo->readPipe, InputThreadNotifyPipe, X_NOTIFY_READ, NULL); SetNotifyFd(inputThreadInfo->readPipe, InputThreadNotifyPipe, X_NOTIFY_READ, NULL);
@ -438,7 +438,7 @@ InputThreadPreInit(void)
flags = fcntl(hotplugPipeRead, F_GETFD); flags = fcntl(hotplugPipeRead, F_GETFD);
if (flags != -1) { if (flags != -1) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
(void)fcntl(hotplugPipeRead, F_SETFD, &flags); (void)fcntl(hotplugPipeRead, F_SETFD, flags);
} }
hotplugPipeWrite = hotplugPipe[1]; hotplugPipeWrite = hotplugPipe[1];