moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-02 15:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of the optional mode argument in our open() hook

Browse Source
This commit is contained in:
Cameron Gutman 2022-09-03 17:52:54 -05:00
parent fae9813127
commit 58429f4172
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/masterhook.c
View File

@ -13,6 +13,7 @@
#include <SDL.h> #include <SDL.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -20,6 +21,16 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
// __OPEN_NEEDS_MODE is a glibc-ism, so define it ourselves for other libc
#ifndef __OPEN_NEEDS_MODE
#ifdef __O_TMPFILE
# define __OPEN_NEEDS_MODE(oflag) \
(((oflag) & O_CREAT) != 0 || ((oflag) & __O_TMPFILE) == __O_TMPFILE)
#else
# define __OPEN_NEEDS_MODE(oflag) (((oflag) & O_CREAT) != 0)
#endif
#endif
// We require SDL 2.0.15+ to hook because it supports sharing // We require SDL 2.0.15+ to hook because it supports sharing
// the DRM FD with our code. This avoids having multiple DRM FDs // the DRM FD with our code. This avoids having multiple DRM FDs
// in flight at the same time which would significantly complicate // in flight at the same time which would significantly complicate
@ -37,11 +48,9 @@ int g_SdlDrmMasterFd = -1;
int drmIsMaster(int fd) int drmIsMaster(int fd)
{ {
/* Detect master by attempting something that requires master. // Detect master by attempting something that requires master.
* This method is available in Mesa DRM since Feb 2019. // This method is available in Mesa DRM since Feb 2019.
*/
return drmAuthMagic(fd, 0) != -EACCES; return drmAuthMagic(fd, 0) != -EACCES;
} }
// This hook will handle legacy DRM rendering // This hook will handle legacy DRM rendering
@ -85,10 +94,21 @@ int drmModeAtomicCommit(int fd, drmModeAtomicReqPtr req,
// hook this variant of open(), since that's what SDL uses. When we see // hook this variant of open(), since that's what SDL uses. When we see
// the open a FD for the same card as the Qt DRM master FD, we'll drop // the open a FD for the same card as the Qt DRM master FD, we'll drop
// master on the Qt FD to allow the new FD to have master. // master on the Qt FD to allow the new FD to have master.
int open(const char *pathname, int flags) int open(const char *pathname, int flags, ...)
{ {
int fd;
// Call the real thing to do the open operation // Call the real thing to do the open operation
int fd = ((typeof(open)*)dlsym(RTLD_NEXT, "open"))(pathname, flags); if (__OPEN_NEEDS_MODE(flags)) {
va_list va;
va_start(va, flags);
mode_t mode = va_arg(va, mode_t);
fd = ((typeof(open)*)dlsym(RTLD_NEXT, "open"))(pathname, flags, mode);
va_end(va);
}
else {
fd = ((typeof(open)*)dlsym(RTLD_NEXT, "open"))(pathname, flags);
}
// If the file was successfully opened and we have a DRM master FD, // If the file was successfully opened and we have a DRM master FD,
// check if the FD we just opened is a DRM device. // check if the FD we just opened is a DRM device.
@ -119,7 +139,16 @@ int open(const char *pathname, int flags)
// but since we just dropped the master, we can become master by // but since we just dropped the master, we can become master by
// simply creating a new FD. Let's do it. // simply creating a new FD. Let's do it.
close(fd); close(fd);
fd = ((typeof(open)*)dlsym(RTLD_NEXT, "open"))(pathname, flags); if (__OPEN_NEEDS_MODE(flags)) {
va_list va;
va_start(va, flags);
mode_t mode = va_arg(va, mode_t);
fd = ((typeof(open)*)dlsym(RTLD_NEXT, "open"))(pathname, flags, mode);
va_end(va);
}
else {
fd = ((typeof(open)*)dlsym(RTLD_NEXT, "open"))(pathname, flags);
}
g_SdlDrmMasterFd = fd; g_SdlDrmMasterFd = fd;
} }
} }