Files
DroidDeck/tools/fex/patches/0001-openat2-enosys-fallback.patch
T
The412Banner ae94d9db54 feat: optional x86-64 Steam client (Valve's Linux client under FEX) beside the arm64 one (#152)
An opt-in second Steam client (Steam settings, Steam client: x86-64): Valve's
x86-64 Linux client, unchanged, runs under FEX in its own home with its own
game library and the same sign-in. Linux builds run directly, so titles such
as Team Fortress 2 and Half-Life use their Linux versions; Windows games use
DroidDeck-Proton as on arm64. The arm64 client stays the default.

- droiddeck-steam-x64: FEX and the x86-64 rootfs from DroidDeck-Components
  (sha256-pinned), client install and sync from Valve's CDN, sign-in shared
  with the arm64 client, its web helper on the GPU (ANGLE GL over FEX's GL
  thunk, zink, Turnip), Proton wrappers for the arm64 client's tools,
  DroidDeck direct for Linux builds, SD-card library (x86-64/ beside the
  arm64 one), repair.
- FEX 2610 built by build-fex.yml with thunks and three patches: an openat2
  fallback without openat2 (proot), newer-clang thunkgen, MAP_32BIT
  exhaustion returning ENOMEM. libblsession resolves RESOLVE_IN_ROOT paths
  inside the root.
- Session: x86-64 gating, shortcuts and compatibility tools per client,
  logs from the client that ran.
- App: client setting with the FEX version, an x86-64 chip on the Games
  header, the active client's library, art, storage, downloads, repair,
  Offline Mode, Decky, desktop mode, optional VAC diagnostics; per-client
  state for art, the content log, repair and leftovers.
- Strings in every locale.
- Review fixes: the library cache is saved only by the newest scan; an
  abandoned session's Steam logs come from the client it recorded; distinct
  VAC console names; FEXInterpreter in CPU pinning; clearer VAC hint in
  pl, ru, uk, cs and bg.
2026-10-17 23:57:52 -04:00

204 lines
6.5 KiB
Diff

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp
index 7172460..2c80dca 100644
--- a/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp
+++ b/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp
@@ -29,6 +29,7 @@ $end_info$
#include <algorithm>
#include <errno.h>
#include <cstring>
+#include <linux/magic.h>
#include <linux/openat2.h>
#include <fcntl.h>
#include <filesystem>
@@ -632,6 +633,163 @@ static bool ShouldSkipOpenInEmu(int flags) {
return false;
}
+static bool IsOnProcFS(int DirFD, const char* Pathname) {
+ int FD = ::openat(DirFD, Pathname, O_PATH | O_NOFOLLOW | O_CLOEXEC);
+ if (FD == -1) {
+ return false;
+ }
+
+ struct statfs Buffer {};
+ const bool Result = fstatfs(FD, &Buffer) == 0 && Buffer.f_type == PROC_SUPER_MAGIC;
+ close(FD);
+ return Result;
+}
+
+// openat2() with RESOLVE_IN_ROOT, walked one component at a time: PRoot has no openat2 and fails it with ENOSYS.
+// DirFD is AT_FDCWD only for thunk overlays, which never resolve in the root.
+static int OpenatWithoutOpenat2(int DirFD, const char* Pathname, int Flags, uint32_t Mode) {
+ if (DirFD == AT_FDCWD) {
+ return ::syscall(SYSCALL_DEF(openat), DirFD, Pathname, Flags, Mode);
+ }
+
+ // The kernel's MAXSYMLINKS.
+ constexpr uint32_t MaxSymlinks = 40;
+ uint32_t Symlinks {};
+ std::optional<dev_t> RootDev {};
+
+ // O_NOFOLLOW and O_CREAT | O_EXCL leave a final symlink alone, unless a trailing slash follows it.
+ const bool NoFollow = (Flags & O_NOFOLLOW) || (Flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL);
+
+ char Resolved[PATH_MAX];
+ size_t ResolvedLen {};
+
+ std::array<char[PATH_MAX], 2> Pending;
+ uint32_t PendingIndex {};
+ const char* Remaining = Pathname;
+
+ for (;;) {
+ while (*Remaining == '/') {
+ ++Remaining;
+ }
+
+ if (*Remaining == 0) {
+ break;
+ }
+
+ const char* Component = Remaining;
+ const char* ComponentEnd = Component;
+ while (*ComponentEnd != 0 && *ComponentEnd != '/') {
+ ++ComponentEnd;
+ }
+ const size_t ComponentLen = ComponentEnd - Component;
+
+ Remaining = ComponentEnd;
+ while (*Remaining == '/') {
+ ++Remaining;
+ }
+ const bool Last = *Remaining == 0;
+ const bool TrailingSlash = Last && Remaining != ComponentEnd;
+
+ if (ComponentLen == 1 && Component[0] == '.') {
+ continue;
+ }
+
+ if (ComponentLen == 2 && Component[0] == '.' && Component[1] == '.') {
+ while (ResolvedLen > 0 && Resolved[ResolvedLen - 1] != '/') {
+ --ResolvedLen;
+ }
+ if (ResolvedLen > 0) {
+ --ResolvedLen;
+ }
+ continue;
+ }
+
+ const size_t Separator = ResolvedLen > 0 ? 1 : 0;
+ const size_t CandidateLen = ResolvedLen + Separator + ComponentLen;
+ if (CandidateLen + 1 >= PATH_MAX) {
+ errno = ENAMETOOLONG;
+ return -1;
+ }
+ if (Separator) {
+ Resolved[ResolvedLen] = '/';
+ }
+ memcpy(&Resolved[ResolvedLen + Separator], Component, ComponentLen);
+ Resolved[CandidateLen] = 0;
+
+ struct stat Buffer {};
+ const bool Follow = !Last || TrailingSlash || !NoFollow;
+ const int StatResult = Follow ? fstatat(DirFD, Resolved, &Buffer, AT_SYMLINK_NOFOLLOW) : -1;
+
+ if (StatResult == 0 && S_ISLNK(Buffer.st_mode)) {
+ if (++Symlinks > MaxSymlinks) {
+ errno = ELOOP;
+ return -1;
+ }
+
+ if (!RootDev) {
+ struct stat Root {};
+ if (fstat(DirFD, &Root) != 0) {
+ return -1;
+ }
+ RootDev = Root.st_dev;
+ }
+
+ if (Buffer.st_dev != *RootDev && IsOnProcFS(DirFD, Resolved)) {
+ // Only procfs has magic links. RESOLVE_IN_ROOT fails them with EXDEV and the callers then open without it.
+ return ::syscall(SYSCALL_DEF(openat), DirFD, Pathname, Flags, Mode);
+ }
+
+ char* Target = Pending[PendingIndex];
+ const ssize_t TargetLen = readlinkat(DirFD, Resolved, Target, PATH_MAX);
+ if (TargetLen <= 0) {
+ if (TargetLen == 0) {
+ errno = ENOENT;
+ }
+ return -1;
+ }
+
+ const size_t RestLen = strlen(ComponentEnd);
+ if (static_cast<size_t>(TargetLen) + RestLen >= PATH_MAX) {
+ errno = ENAMETOOLONG;
+ return -1;
+ }
+ memcpy(&Target[TargetLen], ComponentEnd, RestLen + 1);
+
+ if (Target[0] == '/') {
+ ResolvedLen = 0;
+ }
+ Remaining = Target;
+ PendingIndex ^= 1;
+ continue;
+ }
+
+ if (Last) {
+ // openat reports on the final component, which O_CREAT may create.
+ ResolvedLen = CandidateLen;
+ if (TrailingSlash) {
+ Resolved[ResolvedLen++] = '/';
+ }
+ break;
+ }
+
+ if (StatResult != 0) {
+ return -1;
+ }
+
+ if (!S_ISDIR(Buffer.st_mode)) {
+ errno = ENOTDIR;
+ return -1;
+ }
+ ResolvedLen = CandidateLen;
+ }
+
+ if (ResolvedLen == 0) {
+ Resolved[ResolvedLen++] = '.';
+ }
+ Resolved[ResolvedLen] = 0;
+ return ::syscall(SYSCALL_DEF(openat), DirFD, Resolved, Flags, Mode);
+}
+
bool FileManager::ReplaceEmuFd(int fd, int flags, uint32_t mode) {
char Tmp[PATH_MAX + 1];
@@ -678,6 +836,8 @@ uint64_t FileManager::Open(const char* pathname, int flags, uint32_t mode) {
// This means a magic symlink (/proc/foo) was involved. In this case we
// just punt and do the access without RESOLVE_IN_ROOT.
fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode);
+ } else if (fd == -1 && errno == ENOSYS) {
+ fd = OpenatWithoutOpenat2(Path.FD, Path.Path, flags, mode);
}
}
@@ -931,6 +1091,8 @@ uint64_t FileManager::Openat([[maybe_unused]] int dirfs, const char* pathname, i
// This means a magic symlink (/proc/foo) was involved. In this case we
// just punt and do the access without RESOLVE_IN_ROOT.
fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode);
+ } else if (fd == -1 && errno == ENOSYS) {
+ fd = OpenatWithoutOpenat2(Path.FD, Path.Path, flags, mode);
}
}
@@ -967,6 +1129,8 @@ uint64_t FileManager::Openat2(int dirfs, const char* pathname, FEX::HLE::open_ho
// This means a magic symlink (/proc/foo) was involved. In this case we
// just punt and do the access without RESOLVE_IN_ROOT.
fd = ::syscall(SYSCALL_DEF(openat2), Path.FD, Path.Path, how, usize);
+ } else if (fd == -1 && errno == ENOSYS && how->resolve == 0) {
+ fd = OpenatWithoutOpenat2(Path.FD, Path.Path, how->flags, how->mode);
}
}