From dc98b6b96a19cc1ae724d4ee7f4157be0eb0a58c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 16 Nov 2026 09:35:16 -0500 Subject: [PATCH] feat: target Android 14 so Play Protect installs DroidDeck without a warning (#2683) * fix(proot): ship proot in the APK and run it from the native library directory * fix(native): start rootfs programs through an APK-shipped exec loader where data files may not be executed * fix(audio): start PulseAudio through the system linker where data files may not be executed * feat: target Android 14 (SDK 34) so Play Protect installs DroidDeck without a warning * fix: ask for all-files access on Android 11+, reject unloadable ELFs before exec, keep checking the proot pack * fix: hand host scripts to the kernel, skip startup launch while all-files Settings is open * fix: run proot from its add-on pack through Android's linker, so the APK carries no proot * fix: declare high sampling rate sensors for controller gyro at target 34 * fix: offer the rootfs proot fallback only where Android lets proot exec its loader * test: install the runtime's proot pack in GameFileSync fixtures --- app/build.gradle | 8 +- app/src/main/AndroidManifest.xml | 30 +- app/src/main/cpp/CMakeLists.txt | 6 + app/src/main/cpp/ddexec/ddexec.c | 274 ++++++++++++++++++ .../main/java/com/droiddeck/launcher/App.kt | 3 +- .../droiddeck/launcher/FrontEndActivity.kt | 15 +- .../com/droiddeck/launcher/SessionActivity.kt | 14 + .../launcher/agent/AgentProcesses.kt | 6 +- .../launcher/audio/PulseAudioComponent.java | 9 +- .../droiddeck/launcher/core/HostProcess.kt | 6 + .../launcher/runtime/BwrapSpawner.kt | 7 +- .../runtime/DeviceControlsComponent.kt | 7 +- .../launcher/runtime/GuestCommand.kt | 2 +- .../runtime/LinuxNetworkLinkComponent.kt | 6 +- .../launcher/runtime/LinuxRuntime.java | 31 +- .../runtime/LinuxRuntimeInstaller.java | 2 +- .../droiddeck/launcher/runtime/NativeGuest.kt | 21 +- .../launcher/session/SessionPrefs.kt | 12 + .../launcher/session/SessionService.kt | 2 +- .../launcher/frontend/GameFileSyncTest.kt | 10 +- tools/nativeguest/ddnatv-hook.c | 1 + tools/nativeguest/hook/env.c | 13 +- tools/nativeguest/hook/exec.c | 110 ++++++- tools/nativeguest/hook/paths.c | 27 +- tools/nativeguest/hook/setup.c | 9 +- tools/proot/PATCHES.md | 4 +- tools/release/runtime_inputs.py | 9 +- tools/tests/test_runtime_inputs.py | 15 + 28 files changed, 601 insertions(+), 58 deletions(-) create mode 100644 app/src/main/cpp/ddexec/ddexec.c diff --git a/app/build.gradle b/app/build.gradle index 4ca98a45db..cb5b882ec7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -130,7 +130,7 @@ android { defaultConfig { applicationId "com.droiddeck.launcher" minSdkVersion 26 - targetSdkVersion 28 + targetSdkVersion 34 versionCode 19 versionName "0.7.1" buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" @@ -201,10 +201,6 @@ android { } } - lint { - disable 'ExpiredTargetSdkVersion' - } - androidResources { ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:droiddeck-ubisoft:droiddeck-rockstar:droiddeck-dirt:directaudio:hybris' } @@ -216,7 +212,7 @@ android { jniLibs { useLegacyPackaging = true pickFirsts += ['**/libtermux.so'] - excludes += ['**/libproot.so', '**/libproot-loader.so', '**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] + excludes += ['**/libproot.so', '**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2adbfc86cd..54fe09ca7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,7 +36,12 @@ + + + + + @@ -48,7 +53,8 @@ - + + @@ -70,6 +76,7 @@ android:hardwareAccelerated="true" android:largeHeap="true" android:extractNativeLibs="true" + android:requestLegacyExternalStorage="true" android:appCategory="game" android:isGame="true"> @@ -312,7 +319,11 @@ android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" android:theme="@style/SessionTheme" /> - + + + + android:stopWithTask="false" + android:foregroundServiceType="specialUse"> + + + android:exported="false" + android:foregroundServiceType="dataSync" /> + android:exported="false" + android:foregroundServiceType="specialUse"> + + [args...] +// +// From targetSdk 29, Android refuses execve() of app data files, but still lets the app map them +// executable, and executes the APK's extracted libraries. This executable is one of those libraries: +// it maps (and its PT_INTERP, if it names one) the way the kernel's ELF loader would, builds the +// stack the kernel would have built for " [args...]", and jumps to the entry point. +// It is freestanding: no libc, no relocations, so the kernel can run it as a static PIE. + +#include +#include +#include + +#define SYS_faccessat 48 +#define SYS_openat 56 +#define SYS_close 57 +#define SYS_pread64 67 +#define SYS_write 64 +#define SYS_exit_group 94 +#define SYS_munmap 215 +#define SYS_mmap 222 +#define SYS_mprotect 226 + +#define AT_FDCWD_ (-100) +#define O_RDONLY_ 0 +#define O_CLOEXEC_ 02000000 +#define PROT_READ_ 1 +#define PROT_WRITE_ 2 +#define PROT_EXEC_ 4 +#define MAP_PRIVATE_ 0x02 +#define MAP_FIXED_ 0x10 +#define MAP_ANONYMOUS_ 0x20 +#define MAX_PHDRS 64 +#define STACK_GAP 65536 + +static long sys6(long n, long a, long b, long c, long d, long e, long f) { + register long x8 __asm__("x8") = n; + register long x0 __asm__("x0") = a; + register long x1 __asm__("x1") = b; + register long x2 __asm__("x2") = c; + register long x3 __asm__("x3") = d; + register long x4 __asm__("x4") = e; + register long x5 __asm__("x5") = f; + __asm__ volatile("svc #0" : "+r"(x0) : "r"(x8), "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5) : "memory", "cc"); + return x0; +} + +static size_t slen(const char *s) { + size_t n = 0; + while (s[n]) n++; + return n; +} + +static void out(const char *s) { sys6(SYS_write, 2, (long)s, (long)slen(s), 0, 0, 0); } + +static void out_num(long v) { + char buf[24]; + int i = (int)sizeof(buf) - 1; + buf[i] = 0; + unsigned long u = v < 0 ? (unsigned long)-v : (unsigned long)v; + do { + buf[--i] = (char)('0' + u % 10); + u /= 10; + } while (u && i > 1); + if (v < 0) buf[--i] = '-'; + out(buf + i); +} + +__attribute__((noreturn)) static void die(const char *what, const char *path, long err) { + out("libddexec: "); + if (path) { + out(path); + out(": "); + } + out(what); + if (err) { + out(" ("); + out_num(err); + out(")"); + } + out("\n"); + sys6(SYS_exit_group, 127, 0, 0, 0, 0, 0); + __builtin_unreachable(); +} + +static long xpread(int fd, void *buf, size_t len, long off) { + size_t done = 0; + while (done < len) { + long n = sys6(SYS_pread64, fd, (long)((char *)buf + done), (long)(len - done), off + (long)done, 0, 0); + if (n <= 0) return n < 0 ? n : -1; + done += (size_t)n; + } + return (long)done; +} + +struct image { + uintptr_t base; + uintptr_t phdr; + uintptr_t entry; + unsigned long phnum; + unsigned long phent; + char interp[256]; +}; + +static uintptr_t trunc_page(uintptr_t v, uintptr_t page) { return v & ~(page - 1); } +static uintptr_t round_page(uintptr_t v, uintptr_t page) { return (v + page - 1) & ~(page - 1); } + +static int prot_of(uint32_t flags) { + return ((flags & PF_R) ? PROT_READ_ : 0) | ((flags & PF_W) ? PROT_WRITE_ : 0) | ((flags & PF_X) ? PROT_EXEC_ : 0); +} + +static void map_failed(const char *path, long r) { die("cannot map a segment", path, r); } + +static void load(const char *path, struct image *im, uintptr_t page) { + int fd = (int)sys6(SYS_openat, AT_FDCWD_, (long)path, O_RDONLY_ | O_CLOEXEC_, 0, 0, 0); + if (fd < 0) die("cannot open", path, fd); + Elf64_Ehdr eh; + if (xpread(fd, &eh, sizeof(eh), 0) != (long)sizeof(eh)) die("not an ELF file", path, 0); + if (eh.e_ident[EI_MAG0] != ELFMAG0 || eh.e_ident[EI_MAG1] != ELFMAG1 || eh.e_ident[EI_MAG2] != ELFMAG2 || + eh.e_ident[EI_MAG3] != ELFMAG3 || eh.e_ident[EI_CLASS] != ELFCLASS64 || eh.e_machine != EM_AARCH64 || + (eh.e_type != ET_EXEC && eh.e_type != ET_DYN) || eh.e_phentsize != sizeof(Elf64_Phdr) || + eh.e_phnum == 0 || eh.e_phnum > MAX_PHDRS) + die("not a 64-bit ARM ELF program", path, 0); + Elf64_Phdr ph[MAX_PHDRS]; + long size = (long)eh.e_phnum * (long)sizeof(Elf64_Phdr); + if (xpread(fd, ph, (size_t)size, (long)eh.e_phoff) != size) die("truncated program headers", path, 0); + + uintptr_t lo = UINTPTR_MAX, hi = 0; + for (int i = 0; i < eh.e_phnum; i++) { + if (ph[i].p_type != PT_LOAD) continue; + uintptr_t s = trunc_page(ph[i].p_vaddr, page), e = round_page(ph[i].p_vaddr + ph[i].p_memsz, page); + if (s < lo) lo = s; + if (e > hi) hi = e; + } + if (lo >= hi) die("no loadable segments", path, 0); + + uintptr_t bias = 0; + if (eh.e_type == ET_DYN) { + long r = sys6(SYS_mmap, 0, (long)(hi - lo), 0, MAP_PRIVATE_ | MAP_ANONYMOUS_, -1, 0); + if (r < 0 && r > -4096) map_failed(path, r); + bias = (uintptr_t)r - lo; + } + + for (int i = 0; i < eh.e_phnum; i++) { + Elf64_Phdr *p = &ph[i]; + if (p->p_type != PT_LOAD || p->p_memsz == 0) continue; + int prot = prot_of(p->p_flags); + uintptr_t seg = bias + p->p_vaddr; + uintptr_t start = trunc_page(seg, page); + uintptr_t file_end = seg + p->p_filesz; + uintptr_t mem_end = round_page(seg + p->p_memsz, page); + int zero_tail = p->p_memsz > p->p_filesz && (file_end & (page - 1)) != 0; + if (p->p_filesz > 0) { + uintptr_t len = round_page(file_end, page) - start; + long r = sys6(SYS_mmap, (long)start, (long)len, prot | (zero_tail ? PROT_WRITE_ : 0), + MAP_PRIVATE_ | MAP_FIXED_, fd, (long)trunc_page(p->p_offset, page)); + if (r < 0 && r > -4096) map_failed(path, r); + if (zero_tail) { + for (volatile char *z = (volatile char *)file_end; (uintptr_t)z < round_page(file_end, page); z++) *z = 0; + if (!(prot & PROT_WRITE_)) sys6(SYS_mprotect, (long)trunc_page(file_end, page), (long)page, prot, 0, 0, 0); + } + } + uintptr_t anon = p->p_filesz > 0 ? round_page(file_end, page) : start; + if (mem_end > anon) { + long r = sys6(SYS_mmap, (long)anon, (long)(mem_end - anon), prot, MAP_PRIVATE_ | MAP_FIXED_ | MAP_ANONYMOUS_, -1, 0); + if (r < 0 && r > -4096) map_failed(path, r); + } + } + + im->base = bias; + im->entry = bias + eh.e_entry; + im->phnum = eh.e_phnum; + im->phent = eh.e_phentsize; + im->phdr = 0; + im->interp[0] = 0; + for (int i = 0; i < eh.e_phnum; i++) { + if (ph[i].p_type == PT_PHDR) im->phdr = bias + ph[i].p_vaddr; + if (ph[i].p_type == PT_INTERP) { + if (ph[i].p_filesz == 0 || ph[i].p_filesz >= sizeof(im->interp)) die("bad PT_INTERP", path, 0); + if (xpread(fd, im->interp, ph[i].p_filesz, (long)ph[i].p_offset) != (long)ph[i].p_filesz) + die("truncated PT_INTERP", path, 0); + im->interp[ph[i].p_filesz] = 0; + } + } + if (!im->phdr) { + for (int i = 0; i < eh.e_phnum; i++) { + Elf64_Phdr *p = &ph[i]; + if (p->p_type == PT_LOAD && eh.e_phoff >= p->p_offset && eh.e_phoff < p->p_offset + p->p_filesz) { + im->phdr = bias + p->p_vaddr + (eh.e_phoff - p->p_offset); + break; + } + } + } + if (!im->phdr) die("program headers are not in a loaded segment", path, 0); + sys6(SYS_close, fd, 0, 0, 0, 0, 0); +} + +static unsigned long auxv_get(const uintptr_t *auxv, unsigned long type, unsigned long fallback) { + for (; auxv[0] != AT_NULL; auxv += 2) + if (auxv[0] == type) return auxv[1]; + return fallback; +} + +__attribute__((used, noreturn)) void ddexec_main(uintptr_t *sp) { + long argc = (long)sp[0]; + char **argv = (char **)(sp + 1); + char **envp = argv + argc + 1; + long nenv = 0; + while (envp[nenv]) nenv++; + uintptr_t *auxv = (uintptr_t *)(envp + nenv + 1); + long naux = 0; + while (auxv[naux * 2] != AT_NULL) naux++; + if (argc < 3) die("usage: libddexec.so [args...]", 0, 0); + + uintptr_t page = auxv_get(auxv, AT_PAGESZ, 4096); + const char *path = argv[1]; + struct image prog, interp; + load(path, &prog, page); + int has_interp = prog.interp[0] != 0; + if (has_interp) load(prog.interp, &interp, page); + + // The new stack: argc, argv, envp and auxv as the kernel lays them out, below the current one. + // The strings stay where the kernel put them. + static const unsigned long replaced[] = {AT_PHDR, AT_PHENT, AT_PHNUM, AT_BASE, AT_ENTRY, AT_EXECFN}; + long nreplaced = (long)(sizeof(replaced) / sizeof(replaced[0])); + long new_argc = argc - 2; + long words = 1 + (new_argc + 1) + (nenv + 1) + (naux + nreplaced + 1) * 2; + uintptr_t *nsp = (uintptr_t *)(((uintptr_t)sp - STACK_GAP - (uintptr_t)words * sizeof(uintptr_t)) & ~(uintptr_t)15); + uintptr_t *w = nsp; + *w++ = (uintptr_t)new_argc; + for (long i = 0; i < new_argc; i++) *w++ = (uintptr_t)argv[i + 2]; + *w++ = 0; + for (long i = 0; i < nenv; i++) *w++ = (uintptr_t)envp[i]; + *w++ = 0; + for (long i = 0; i < naux; i++) { + unsigned long type = auxv[i * 2]; + int skip = 0; + for (long r = 0; r < nreplaced; r++) + if (type == replaced[r]) skip = 1; + if (skip) continue; + *w++ = type; + *w++ = auxv[i * 2 + 1]; + } + *w++ = AT_PHDR; + *w++ = prog.phdr; + *w++ = AT_PHENT; + *w++ = prog.phent; + *w++ = AT_PHNUM; + *w++ = prog.phnum; + *w++ = AT_BASE; + *w++ = has_interp ? interp.base : 0; + *w++ = AT_ENTRY; + *w++ = prog.entry; + *w++ = AT_EXECFN; + *w++ = (uintptr_t)path; + *w++ = AT_NULL; + *w++ = 0; + + uintptr_t entry = has_interp ? interp.entry : prog.entry; + __asm__ volatile("mov sp, %0\n" + "mov x0, #0\n" + "br %1\n" + : + : "r"(nsp), "r"(entry) + : "memory"); + __builtin_unreachable(); +} + +__attribute__((naked, noreturn)) void _start(void) { + __asm__ volatile("mov x0, sp\n" + "and sp, x0, #~15\n" + "bl ddexec_main\n"); +} diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index ca67a83778..3cedb3f171 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -20,6 +20,7 @@ class App : Application() { override fun onCreate() { super.onCreate() + com.droiddeck.launcher.runtime.NativeGuest.init(this) Thread({ runCatching { EnhancedSessionLogShare.cleanupAbandonedStages(this) } }, "diagnostic-stage-cleanup").start() com.droiddeck.launcher.ui.Themes.loadGradient(this) com.droiddeck.launcher.ui.BuildWatermark.install(this) @@ -82,7 +83,7 @@ class App : Application() { Thread({ runCatching { if (com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app).isDirectory) { - com.droiddeck.launcher.core.AddonPack.PROOT.ensure(app) + if (!com.droiddeck.launcher.runtime.LinuxRuntime.patchedProot(app)) com.droiddeck.launcher.core.AddonPack.PROOT.ensure(app) com.droiddeck.launcher.core.AddonPack.DIRECTAUDIO.ensure(app) com.droiddeck.launcher.session.SessionFiles.ensureDirtStandIn(app) } diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 4e774e76b6..bdb334a9e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1863,15 +1863,24 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } } - if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled(cold = true) } - else { + val askAllFiles = Build.VERSION.SDK_INT >= 30 && com.droiddeck.launcher.files.AllFilesAccess.missing() && + !SessionPrefs.allFilesAsked(this) + if (savedInstanceState == null) { + if (!askAllFiles) ui.post { startSteamAtStartupIfEnabled(cold = true) } + } else { restoreCompatLaunch(savedInstanceState) pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH) savedIntent(savedInstanceState, KEY_SWITCHING_TO)?.let { awaitSessionEnd(it, savedInstanceState.getLong(KEY_SWITCH_DEADLINE)) } } val wanted = ArrayList() - if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + if (Build.VERSION.SDK_INT >= 30) { + // From targetSdk 30, shared storage outside the app's own folders is all-files access or nothing. + if (askAllFiles) { + SessionPrefs.setAllFilesAsked(this) + com.droiddeck.launcher.files.AllFilesAccess.open(this) + } + } else if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { wanted.add(Manifest.permission.WRITE_EXTERNAL_STORAGE) } if (SessionPrefs.micEnabled(this) && !SessionPrefs.micAsked(this) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 23fffd4001..dd70bb2d09 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -850,6 +850,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } SteamControllerBle.listener = { uiHandler.post { updatePadMotion(); refreshControls() } } steamController = SteamControllerBle(this, inputRouter).also { it.start() } + if (Build.VERSION.SDK_INT >= 31 && checkSelfPermission(BLUETOOTH_CONNECT) != android.content.pm.PackageManager.PERMISSION_GRANTED && + !SessionPrefs.bluetoothAsked(this)) { + SessionPrefs.setBluetoothAsked(this) + requestPermissions(arrayOf(BLUETOOTH_CONNECT), REQUEST_BLUETOOTH) + } padMotion = com.droiddeck.launcher.input.PadMotion(this) { @Suppress("DEPRECATION") (if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay)?.rotation ?: android.view.Surface.ROTATION_0 @@ -6354,8 +6359,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde finish() } + override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + if (requestCode != REQUEST_BLUETOOTH || grantResults.firstOrNull() != android.content.pm.PackageManager.PERMISSION_GRANTED) return + steamController?.stop() + steamController = SteamControllerBle(this, inputRouter).also { it.start() } + } + companion object { const val EXTRA_RETURN_HOME = "returnHome" + private const val BLUETOOTH_CONNECT = "android.permission.BLUETOOTH_CONNECT" + private const val REQUEST_BLUETOOTH = 31 const val EXTRA_LINK_TASK = "linkTask" const val EXTRA_STEAMVR = "steamVr" const val EXTRA_PLAYED_GAME = "com.droiddeck.launcher.PLAYED_GAME" diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt index c845db6813..52c1dc424c 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt @@ -40,7 +40,11 @@ object AgentProcesses { val now = SystemClock.elapsedRealtime() val uptimeTicks = now * HZ / 1000 val elapsed = (now - lastAt).coerceAtLeast(1) - fun isProot(pid: Int) = args[pid].orEmpty().substringBefore(' ').endsWith("proot.so") || args[pid].orEmpty().substringBefore(' ').endsWith("/proot") + fun isProot(pid: Int): Boolean { + val argv = args[pid].orEmpty().split(' ') + val program = if (argv.first().endsWith("/linker64")) argv.getOrElse(1) { "" } else argv.first() + return program.endsWith("proot.so") || program.endsWith("/proot") + } fun ancestors(pid: Int) = generateSequence(stats[pid]?.ppid) { stats[it]?.ppid }.takeWhile { it > 1 }.take(64) val out = stats.values.filter { s -> !isProot(s.pid) && args[s.pid].orEmpty().isNotEmpty() && ancestors(s.pid).any { isProot(it) } diff --git a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java index d3495a353d..6aa7d13456 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java @@ -168,7 +168,7 @@ public class PulseAudioComponent extends SessionPart { env.add("HOME=" + workingDir); env.add("TMPDIR=" + workingDir); - String command = workingDir.getAbsolutePath() + "/libpulseaudio.so" + String command = String.join(" ", HostProcess.dataExecutable(workingDir.getAbsolutePath() + "/libpulseaudio.so")) + " --system=false --disable-shm=true --fail=false" + " -n --file=default.pa --daemonize=false --use-pid-file=false --exit-idle-time=-1" + " --log-level=info"; @@ -259,7 +259,7 @@ public class PulseAudioComponent extends SessionPart { try { File modules = new File(workingDir, "modules/arm64"); ArrayList cmd = new ArrayList<>(); - cmd.add(pactl.getAbsolutePath()); + cmd.addAll(HostProcess.dataExecutable(pactl.getAbsolutePath())); java.util.Collections.addAll(cmd, args); ProcessBuilder builder = new ProcessBuilder(cmd); builder.directory(workingDir); @@ -316,8 +316,9 @@ public class PulseAudioComponent extends SessionPart { java.lang.Process process = null; try { File modules = new File(workingDir, "modules/arm64"); - ProcessBuilder builder = new ProcessBuilder( - pactl.getAbsolutePath(), "suspend-" + kind, name, Boolean.toString(suspended)); + ArrayList argv = new ArrayList<>(HostProcess.dataExecutable(pactl.getAbsolutePath())); + argv.addAll(java.util.Arrays.asList("suspend-" + kind, name, Boolean.toString(suspended))); + ProcessBuilder builder = new ProcessBuilder(argv); builder.directory(workingDir); builder.redirectErrorStream(true); builder.redirectOutput(new File("/dev/null")); diff --git a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt index 114e337892..d4a2cdc66d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt @@ -6,6 +6,12 @@ import java.util.function.Consumer object HostProcess { private const val TAG = "HostProcess" + private const val LINKER = "/system/bin/linker64" + + /** Android 10+ refuses to execute app data files for targetSdk 29+; its linker still loads them. */ + @JvmStatic + fun dataExecutable(path: String): List = + if (android.os.Build.VERSION.SDK_INT >= 29) listOf(LINKER, path) else listOf(path) @JvmStatic fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?): Int = diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index 4a98fdedec..1eed2f3842 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -384,7 +384,7 @@ object BwrapSpawner { val program = plan.argv.firstOrNull()?.takeIf { it.startsWith("/") }?.let(::host)?.canonicalFile ?.takeIf { it.isFile && isStaticElf(it) } ?: return null if (!linkMounts(plan)) return null - return (listOf(program.path) + plan.argv.drop(1)) to plan.env + return (NativeGuest.execPrefix(program.path) + listOf(program.path) + plan.argv.drop(1)) to plan.env } val loader = SANDBOX_LOADERS.map(::host).firstOrNull { it.isFile }?.canonicalFile ?: return null val libc = SANDBOX_LIBCS.map(::host).firstOrNull { it.isFile }?.canonicalFile ?: return null @@ -411,13 +411,14 @@ object BwrapSpawner { plan.env.map { (k, v) -> "$k=$v" } + plan.argv val env = linkedMapOf( "DDNATV_ROOT" to sandbox, + "DDNATV_EXEC" to NativeGuest.execLoader.orEmpty(), "DDNATV_LINK_ROOT" to rootfs.path, "DDNATV_BINDS" to plan.binds.joinToString("|") { "${it.host}:${it.guest}" }, "DDNATV_HOSTNAME" to SessionPrefs.guestHostname(context), "LD_LIBRARY_PATH" to SANDBOX_LIB_DIRS.map(::host).filter { it.isDirectory }.joinToString(":") { it.path }, "LD_PRELOAD" to hook.path, ).filterValues { it.isNotEmpty() } - return (NativeGuest.simulator(rootfs)?.let { it + launch } ?: launch) to env + return (NativeGuest.simulator(rootfs)?.let { it + launch } ?: (NativeGuest.execPrefix(loader.path) + launch)) to env } private val runpathDirs = java.util.concurrent.ConcurrentHashMap>() @@ -542,7 +543,7 @@ object BwrapSpawner { .also { b -> b.environment().apply { clear(); putAll(native.second) } } } else { val cmd = LinuxRuntime.prootPrefix(context, plan.root, plan.cwd) - if (verbose != null) { cmd.add(1, "-v"); cmd.add(2, verbose.toString()) } + if (verbose != null) { cmd.add("-v"); cmd.add(verbose.toString()) } plan.binds.forEach { cmd.add("-b"); cmd.add(it.spec) } val envTool = hasEnvTool(plan) if (envTool) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt index 334bce3dfc..0f5c48ce21 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -95,10 +95,13 @@ class DeviceControlsComponent(context: Context, root: File, private val activity permissionNotified = false context.contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, observer) requests.startWatching() - context.registerReceiver(volumeSteps, IntentFilter().apply { + val volumeFilter = IntentFilter().apply { addAction(VOLUME_CHANGED_ACTION) addAction(STREAM_MUTE_CHANGED_ACTION) - }, null, handler) + } + if (android.os.Build.VERSION.SDK_INT >= 33) + context.registerReceiver(volumeSteps, volumeFilter, null, handler, Context.RECEIVER_NOT_EXPORTED) + else context.registerReceiver(volumeSteps, volumeFilter, null, handler) refresh.run() } } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 0560752a31..95ea5b13c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -58,7 +58,7 @@ object GuestCommand { NativeGuest.processBuilder(context, root, binds, guest).redirectErrorStream(true) } else { val cmd = LinuxRuntime.prootPrefix(context, root, "/root", fakeRoot) - if (linkDir != null) cmd.add(1, "--link2symlink") + if (linkDir != null) cmd.add("--link2symlink") binds.forEach { cmd.add("-b"); cmd.add(it) } cmd += guest ProcessBuilder(cmd).directory(root).redirectErrorStream(true).also { b -> diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index 46c29aadb8..40cdd0e471 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -106,13 +106,15 @@ class LinuxNetworkLinkComponent( synchronized(lock) { writeNetworkState(currentProperties, currentCapabilities) } } } - appContext.registerReceiver(receiver, IntentFilter().apply { + val wifiFilter = IntentFilter().apply { addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION) addAction(WifiManager.RSSI_CHANGED_ACTION) addAction(WifiManager.WIFI_STATE_CHANGED_ACTION) addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION) addAction(LocationManager.MODE_CHANGED_ACTION) - }) + } + if (android.os.Build.VERSION.SDK_INT >= 33) appContext.registerReceiver(receiver, wifiFilter, Context.RECEIVER_NOT_EXPORTED) + else appContext.registerReceiver(receiver, wifiFilter) wifiReceiver = receiver scanRequestStamp = File(rootDir, "etc/droiddeck-wifi-scan-request").lastModified() scanHandler.post(scanRequests) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 0e5c2d6715..f0e959d0c7 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -2,6 +2,7 @@ package com.droiddeck.launcher.runtime; import com.droiddeck.launcher.core.AddonPack; import android.content.Context; +import android.os.Build; import android.os.Process; import android.system.ErrnoException; import android.system.Os; @@ -77,7 +78,18 @@ public final class LinuxRuntime { } private static boolean rootfsProotReady(Context context) { - return rootfsProot(context).isFile() && rootfsLoader(context).isFile(); + return Build.VERSION.SDK_INT < 29 && rootfsProot(context).isFile() && rootfsLoader(context).isFile(); + } + + /** proot execs its loader, and targetSdk 29+ may exec only the APK's libraries, which hold the pack's matching loader. */ + public static boolean stockProotAllowed(Context context) { + return Build.VERSION.SDK_INT < 29 && SessionPrefs.allowStockProot(context); + } + + /** Android 10+ refuses to execute files from app data for targetSdk 29+, but executes the APK's extracted libraries. */ + private static File bundledLoader(Context context) { + File file = new File(context.getApplicationInfo().nativeLibraryDir, "libproot-loader.so"); + return file.isFile() ? file : null; } public static boolean patchedProot(Context context) { @@ -86,22 +98,21 @@ public final class LinuxRuntime { public static File prootBinary(Context context) { if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot.so"); - if (SessionPrefs.allowStockProot(context)) return rootfsProot(context); + if (stockProotAllowed(context)) return rootfsProot(context); return AddonPack.PROOT.file(context, "libproot.so"); } public static File prootLoader(Context context) { - if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot-loader.so"); - if (SessionPrefs.allowStockProot(context)) return rootfsLoader(context); - return AddonPack.PROOT.file(context, "libproot-loader.so"); + File bundled = bundledLoader(context); + if (AddonPack.PROOT.installed(context)) return bundled != null ? bundled : AddonPack.PROOT.file(context, "libproot-loader.so"); + if (stockProotAllowed(context)) return rootfsLoader(context); + return bundled != null ? bundled : AddonPack.PROOT.file(context, "libproot-loader.so"); } public static String prootSource(Context context) { File bin = prootBinary(context); if (!bin.isFile()) return PROOT_MISSING; - if (AddonPack.PROOT.installed(context) - && bin.getPath().equals(AddonPack.PROOT.file(context, "libproot.so").getPath())) return PROOT_PACK; - return PROOT_ROOTFS; + return patchedProot(context) && !bin.equals(rootfsProot(context)) ? PROOT_PACK : PROOT_ROOTFS; } public static String prootLibraryPath(Context context) { @@ -183,13 +194,13 @@ public final class LinuxRuntime { public static List rootPrefix(Context context, File root, String cwd) { List cmd = prootPrefix(context, root, cwd, true); - cmd.add(1, "--link2symlink"); + cmd.add("--link2symlink"); return cmd; } public static List prootPrefix(Context context, File root, String cwd, boolean fakeRoot) { List cmd = new ArrayList<>(); - cmd.add(prootBinary(context).getPath()); + cmd.addAll(com.droiddeck.launcher.core.HostProcess.dataExecutable(prootBinary(context).getPath())); cmd.add("--kill-on-exit"); cmd.add("--kernel-release=" + guestUtsname(SessionPrefs.guestHostname(context))); int uid = Process.myUid(); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index fe853326ae..e729ec76d9 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -384,7 +384,7 @@ public final class LinuxRuntimeInstaller { String downloading = context.getString(R.string.rtinst_downloading); if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context, () -> true, packProgress(listener, downloading)) - && !SessionPrefs.allowStockProot(context)) + && !LinuxRuntime.stockProotAllowed(context)) return fail("Cannot download proot", AddonPack.PROOT.getFailure()); if (!AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading))) return fail("Cannot download DirectAudio", AddonPack.DIRECTAUDIO.getFailure()); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt index ae4106a081..3cd7d4370f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt @@ -50,6 +50,21 @@ object NativeGuest { fun hook(root: File): File = File(root, HOOK) + /** + * libddexec.so, which starts the rootfs loader on Android 10+, where a targetSdk 29+ app may not + * execute its data files; null where the kernel still starts them directly. + */ + @Volatile var execLoader: String? = null + private set + + /** What starts the program at [path] from the host: nothing before it, or [execLoader] and the path. */ + fun execPrefix(path: String): List = execLoader?.let { listOf(it, path) }.orEmpty() + + fun init(context: Context) { + execLoader = File(context.applicationInfo.nativeLibraryDir, "libddexec.so") + .takeIf { android.os.Build.VERSION.SDK_INT >= 29 && it.isFile }?.path + } + fun loader(root: File): File? = listOf("usr/lib/ld-linux-aarch64.so.1", "lib/ld-linux-aarch64.so.1").map { File(root, it) }.firstOrNull { it.exists() } @@ -60,9 +75,10 @@ object NativeGuest { /** Environment every native process starts with; a guest `env -i` is re-seeded by the hook. */ fun environment(root: File, preload: List = emptyList()): Map = linkedMapOf( "DDNATV_ROOT" to root.path, + "DDNATV_EXEC" to execLoader.orEmpty(), "LD_LIBRARY_PATH" to libraryPath(root), "LD_PRELOAD" to (preload.map { File(root, it.removePrefix("/")).path } + hook(root).path).joinToString(":"), - ) + ).filterValues { it.isNotEmpty() } /** * The host command line for the guest program at [program] (an absolute guest path to a real @@ -72,7 +88,7 @@ object NativeGuest { val loader = checkNotNull(loader(root)) { "no glibc loader in ${root.path}" } val host = File(root, program.removePrefix("/")) val launch = listOf(loader.path, "--argv0", host.name, host.path) + args - return simulator(root)?.let { it + launch } ?: launch + return simulator(root)?.let { it + launch } ?: (execPrefix(loader.path) + launch) } /** The environment of the session process: the hook's root, the mounts proot used to make, the preload list. */ @@ -80,6 +96,7 @@ object NativeGuest { val preload = preloadList(root) return linkedMapOf( "DDNATV_ROOT" to root.path, + "DDNATV_EXEC" to execLoader.orEmpty(), "DDNATV_HOSTNAME" to hostname.orEmpty(), "DDNATV_BINDS" to binds.joinToString("|") { if (it.contains(':')) it else "$it:$it" }, "DDNATV_PRELOAD" to preload.joinToString(":"), diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index c9df167716..04a8d17d7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -707,6 +707,18 @@ object SessionPrefs { fun micAsked(context: Context): Boolean = prefs(context).getBoolean("micAsked", false) + fun allFilesAsked(context: Context): Boolean = prefs(context).getBoolean("allFilesAsked", false) + + fun setAllFilesAsked(context: Context) { + prefs(context).edit().putBoolean("allFilesAsked", true).apply() + } + + fun bluetoothAsked(context: Context): Boolean = prefs(context).getBoolean("bluetoothAsked", false) + + fun setBluetoothAsked(context: Context) { + prefs(context).edit().putBoolean("bluetoothAsked", true).apply() + } + fun setMicAsked(context: Context) { prefs(context).edit().putBoolean("micAsked", true).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 1c34443968..b9e7215dc0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -540,7 +540,7 @@ class SessionService : Service() { } } if (!LinuxRuntime.patchedProot(this)) { - if (SessionPrefs.allowStockProot(this)) { + if (LinuxRuntime.stockProotAllowed(this)) { Log.w(TAG, "proot: patched proot missing; droiddeck-stock-proot allows the rootfs copy") } else { val message = getString(R.string.session_proot_missing) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt index 93a7c352f3..3881bc19a7 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.frontend +import com.droiddeck.launcher.core.AddonPack import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs import org.junit.Assert.* @@ -16,9 +17,10 @@ class GameFileSyncTest { @Test fun syncUsesFreshInstalledManifestsAndStopsWhenDisabled() { val context = RuntimeEnvironment.getApplication() val root = LinuxRuntime.rootDir(context) - listOf("usr/bin/gamescope", LinuxRuntime.SESSION_SCRIPT.removePrefix("/"), "opt/android-host/proot", "opt/android-host/loader").forEach { path -> + listOf("usr/bin/gamescope", LinuxRuntime.SESSION_SCRIPT.removePrefix("/")).forEach { path -> File(root, path).apply { parentFile!!.mkdirs(); writeText("") } } + AddonPack.PROOT.file(context, AddonPack.COMPLETE).apply { parentFile!!.mkdirs(); writeText("") } SessionPrefs.setGameStorage(context, SessionPrefs.GAME_STORAGE_OFF, "") SessionPrefs.setAddedGamesDirs(context, emptyList()) val steamapps = File(root, "root/.local/share/Steam/steamapps").apply { mkdirs() } @@ -51,9 +53,10 @@ class GameFileSyncTest { @Test fun libraryNotCreatedYetOnPresentStorageIsEmptyNotUnavailable() { val context = RuntimeEnvironment.getApplication() val root = LinuxRuntime.rootDir(context) - listOf("usr/bin/gamescope", LinuxRuntime.SESSION_SCRIPT.removePrefix("/"), "opt/android-host/proot", "opt/android-host/loader").forEach { path -> + listOf("usr/bin/gamescope", LinuxRuntime.SESSION_SCRIPT.removePrefix("/")).forEach { path -> File(root, path).apply { parentFile!!.mkdirs(); writeText("") } } + AddonPack.PROOT.file(context, AddonPack.COMPLETE).apply { parentFile!!.mkdirs(); writeText("") } SessionPrefs.setAddedGamesDirs(context, emptyList()) File(root, "root/.local/share/Steam/steamapps").mkdirs() val volume = File(context.filesDir, "card").apply { mkdirs() } @@ -80,9 +83,10 @@ class GameFileSyncTest { @Test fun previousAutomaticLibraryNotCreatedYetKeepsSyncingButRemovedDriveStops() { val context = RuntimeEnvironment.getApplication() val root = LinuxRuntime.rootDir(context) - listOf("usr/bin/gamescope", LinuxRuntime.SESSION_SCRIPT.removePrefix("/"), "opt/android-host/proot", "opt/android-host/loader").forEach { path -> + listOf("usr/bin/gamescope", LinuxRuntime.SESSION_SCRIPT.removePrefix("/")).forEach { path -> File(root, path).apply { parentFile!!.mkdirs(); writeText("") } } + AddonPack.PROOT.file(context, AddonPack.COMPLETE).apply { parentFile!!.mkdirs(); writeText("") } SessionPrefs.setAddedGamesDirs(context, emptyList()) SessionPrefs.setGameStorage(context, "", "") File(root, "root/.local/share/Steam/steamapps").mkdirs() diff --git a/tools/nativeguest/ddnatv-hook.c b/tools/nativeguest/ddnatv-hook.c index 954991c261..58f688da4c 100644 --- a/tools/nativeguest/ddnatv-hook.c +++ b/tools/nativeguest/ddnatv-hook.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/tools/nativeguest/hook/env.c b/tools/nativeguest/hook/env.c index e95083c25e..e881ba1f71 100644 --- a/tools/nativeguest/hook/env.c +++ b/tools/nativeguest/hook/env.c @@ -96,6 +96,7 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { int has_binds = 0; int has_hostname = 0; int has_link_root = 0; + int has_exec_loader = 0; int has_preload_list = 0; const char *preload_value = NULL; while (envp && envp[count]) { @@ -125,6 +126,7 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { else if (strncmp(e, "DDNATV_PRELOAD=", 15) == 0) has_preload_list = 1; else if (strncmp(e, "DDNATV_HOSTNAME=", 16) == 0) has_hostname = 1; else if (strncmp(e, "DDNATV_LINK_ROOT=", 17) == 0) has_link_root = 1; + else if (strncmp(e, "DDNATV_EXEC=", 12) == 0) has_exec_loader = 1; else if (strncmp(e, "DPKG_DEB_THREADS_MAX=", 21) == 0) has_threads_max = 1; else if (strncmp(e, "DEBIAN_FRONTEND=", 16) == 0) has_frontend = 1; else if (strncmp(e, "DEBCONF_FRONTEND=", 17) == 0) has_debconf_frontend = 1; @@ -136,7 +138,7 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { count++; } - char **new_env = calloc(count + 24, sizeof(char *)); + char **new_env = calloc(count + 25, sizeof(char *)); int dst = 0; for (int i = 0; i < count; i++) { if (has_preload && envp[i][0] == 'L' && strncmp(envp[i], "LD_PRELOAD=", 11) == 0) { @@ -223,6 +225,15 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { new_env[dst++] = str; } } + if (!has_exec_loader && g_exec_loader[0] != '\0') { + size_t len = strlen(g_exec_loader); + char *str = malloc(12 + len + 1); + if (str) { + memcpy(str, "DDNATV_EXEC=", 12); + memcpy(str + 12, g_exec_loader, len + 1); + new_env[dst++] = str; + } + } if (!has_link_root && g_link_root_len) { char *str = malloc(17 + g_link_root_len + 1); if (str) { diff --git a/tools/nativeguest/hook/exec.c b/tools/nativeguest/hook/exec.c index 90df96f8fe..ce91b699b5 100644 --- a/tools/nativeguest/hook/exec.c +++ b/tools/nativeguest/hook/exec.c @@ -135,12 +135,103 @@ static int in_exec_rehearsal(void) { pthread_equal(pthread_self(), g_exec_rehearsal_thread); } +// Android's own programs, and the app's extracted libraries, may still be executed directly. +static int exec_directly(const char *path) { + static const char *const prefixes[] = {"/system/", "/vendor/", "/apex/", "/product/", "/odm/", "/system_ext/", "/data/app/"}; + if (g_exec_loader[0] == '\0' || !path || path[0] != '/' || strcmp(path, g_exec_loader) == 0) return 1; + for (size_t i = 0; i < sizeof(prefixes) / sizeof(prefixes[0]); i++) + if (strncmp(path, prefixes[i], strlen(prefixes[i])) == 0) return 1; + return 0; +} + +// ENOENT when the program names a dynamic linker that is not there (a glibc program's +// "/lib/ld-linux-aarch64.so.1" on Android), as the kernel answers: callers try another way. +static int exec_interp_missing(int fd) { + Elf64_Ehdr eh; + if (syscall(SYS_pread64, fd, &eh, sizeof(eh), 0) != (long)sizeof(eh) || eh.e_ident[EI_CLASS] != ELFCLASS64 || + eh.e_machine != EM_AARCH64 || (eh.e_type != ET_EXEC && eh.e_type != ET_DYN) || + eh.e_phentsize != sizeof(Elf64_Phdr) || eh.e_phnum == 0 || eh.e_phnum > 64) + return ENOEXEC; + for (int i = 0; i < eh.e_phnum; i++) { + Elf64_Phdr ph; + if (syscall(SYS_pread64, fd, &ph, sizeof(ph), (long)(eh.e_phoff + (Elf64_Off)i * sizeof(ph))) != (long)sizeof(ph)) + return ENOEXEC; + if (ph.p_type != PT_INTERP) continue; + char interp[PATH_MAX]; + if (ph.p_filesz == 0 || ph.p_filesz >= sizeof(interp) || + syscall(SYS_pread64, fd, interp, ph.p_filesz, (long)ph.p_offset) != (long)ph.p_filesz) + return ENOEXEC; + interp[ph.p_filesz] = 0; + int ifd = (int)syscall(SYS_openat, AT_FDCWD, interp, O_RDONLY | O_CLOEXEC | O_NONBLOCK); + if (ifd < 0) return errno; + syscall(SYS_close, ifd); + return 0; + } + return 0; +} + +// The errors execve() itself would give for [path], which the loader cannot report once it runs: +// a shell walking $PATH moves on at ENOENT and EACCES, and runs a file without "#!" as a script at +// ENOEXEC. +static int exec_preflight(const char *path) { + int fd = (int)syscall(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC | O_NONBLOCK); + if (fd < 0) return errno; + struct stat st; + int err = 0; + unsigned char magic[4]; + if (syscall(SYS_fstat, fd, &st) != 0) err = errno; + else if (!S_ISREG(st.st_mode)) err = EACCES; + else if (syscall(SYS_faccessat, AT_FDCWD, path, X_OK, 0) != 0) err = EACCES; + else if (syscall(SYS_read, fd, magic, 2) == 2 && magic[0] == '#' && magic[1] == '!') err = -1; + else if (syscall(SYS_pread64, fd, magic, sizeof(magic), 0) != (long)sizeof(magic) || + magic[0] != 0x7f || magic[1] != 'E' || magic[2] != 'L' || magic[3] != 'F') err = ENOEXEC; + else err = exec_interp_missing(fd); + syscall(SYS_close, fd); + return err; +} + +// "libddexec.so "; NULL when [path] is executed directly, as a "#!" script the +// kernel hands to its interpreter is. *err is set when the exec would fail. +static char **loader_argv(const char *path, char *const argv[], int *err) { + *err = 0; + if (exec_directly(path)) return NULL; + int preflight = exec_preflight(path); + if (preflight == -1) return NULL; + *err = preflight; + if (*err) return NULL; + int argc = 0; + while (argv && argv[argc]) argc++; + char **out = (char **)malloc(sizeof(char *) * (size_t)(argc + 4)); + if (!out) { + *err = ENOMEM; + return NULL; + } + out[0] = g_exec_loader; + out[1] = (char *)path; + int n = 2; + if (argc == 0) out[n++] = (char *)path; + for (int i = 0; i < argc; i++) out[n++] = argv[i]; + out[n] = NULL; + return out; +} + static int run_execve(orig_execve_f_type f, const char *path, char *const argv[], char *const envp[]) { if (in_exec_rehearsal()) { errno = 0; return 0; } - return f(path, argv, envp); + int err; + char **via = loader_argv(path, argv, &err); + if (err) { + errno = err; + return -1; + } + if (!via) return f(path, argv, envp); + int ret = f(g_exec_loader, via, envp); + int saved_errno = errno; + free(via); + errno = saved_errno; + return ret; } // ldconfig does nothing in The native userland (its cache is for paths that ld.so opens without the hook), but the @@ -701,6 +792,17 @@ static orig_posix_spawn_f_type real_posix_spawn(void) { return orig_posix_spawn; } +static int run_spawn(orig_posix_spawn_f_type f, pid_t *pid, const char *path, const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, char *const argv[], char *const envp[]) { + int err; + char **via = loader_argv(path, argv, &err); + if (err) return err; + if (!via) return f(pid, path, file_actions, attrp, argv, envp); + int ret = f(pid, g_exec_loader, file_actions, attrp, via, envp); + free(via); + return ret; +} + static int ddnatv_posix_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t *attrp, @@ -856,10 +958,10 @@ static int ddnatv_posix_spawn(pid_t *pid, const char *path, ret = ENOMEM; } else { if (orig_posix_spawn) { - ret = orig_posix_spawn(pid, ld_so, file_actions, attrp, new_argv, new_envp); + ret = run_spawn(orig_posix_spawn, pid, ld_so, file_actions, attrp, new_argv, new_envp); if (ret == EACCES && chmod(ld_so, 0755) == 0) { // ld.so without its exec bit (an unusual restore): fix it once and retry - ret = orig_posix_spawn(pid, ld_so, file_actions, attrp, new_argv, new_envp); + ret = run_spawn(orig_posix_spawn, pid, ld_so, file_actions, attrp, new_argv, new_envp); } } free(new_argv); @@ -867,7 +969,7 @@ static int ddnatv_posix_spawn(pid_t *pid, const char *path, } else { if (in_root && probe.is_elf && !probe.is_dynamic) prepare_static_program(elf_target); if (orig_posix_spawn) { - ret = orig_posix_spawn(pid, target, file_actions, attrp, argv, new_envp); + ret = run_spawn(orig_posix_spawn, pid, target, file_actions, attrp, argv, new_envp); } } diff --git a/tools/nativeguest/hook/paths.c b/tools/nativeguest/hook/paths.c index f6361f6133..fc6c49e507 100644 --- a/tools/nativeguest/hook/paths.c +++ b/tools/nativeguest/hook/paths.c @@ -11,10 +11,28 @@ static char g_ddnatv_root[PATH_MAX] = {0}; static size_t g_ddnatv_root_len = 0; +// The path the kernel reports for [path] (/proc/self/fd, getcwd(), realpath()): for a targetSdk 30+ +// app, Android's own /data/user/0 is a link to /data/data, so the app's paths are not what the kernel +// gives back for them. Into out, or path itself when it cannot be resolved; returns out's length. +static size_t ddnatv_kernel_path(const char *path, size_t len, char *out, size_t outsz) { + static char *(*libc_realpath)(const char *, char *) = NULL; + if (!libc_realpath) libc_realpath = (char *(*)(const char *, char *))dlsym(RTLD_NEXT, "realpath"); + char given[PATH_MAX]; + if (len >= sizeof(given)) len = sizeof(given) - 1; + memcpy(given, path, len); + given[len] = '\0'; + char resolved[PATH_MAX]; + const char *use = (libc_realpath && libc_realpath(given, resolved)) ? resolved : given; + size_t n = strlen(use); + if (n >= outsz) n = outsz - 1; + memcpy(out, use, n); + out[n] = '\0'; + return n; +} + static void ddnatv_set_root(const char *root, size_t len) { if (!root) len = 0; - if (len > sizeof(g_ddnatv_root) - 1) len = sizeof(g_ddnatv_root) - 1; - if (len > 0) memcpy(g_ddnatv_root, root, len); + if (len > 0) len = ddnatv_kernel_path(root, len, g_ddnatv_root, sizeof(g_ddnatv_root)); g_ddnatv_root[len] = '\0'; g_ddnatv_root_len = len; } @@ -61,6 +79,11 @@ static void ddnatv_load_binds(const char *spec) { if (colon) *colon = '\0'; if (src[0] != '/' || dst[0] != '/' || strcmp(dst, "/") == 0) continue; struct ddnatv_bind *b = &g_binds[g_nbinds++]; + char kernel_src[PATH_MAX]; + if (strcmp(src, dst) != 0) { + ddnatv_kernel_path(src, strlen(src), kernel_src, sizeof(kernel_src)); + src = kernel_src; + } b->src = strdup(src); b->dst = strdup(dst); b->src_len = strlen(src); diff --git a/tools/nativeguest/hook/setup.c b/tools/nativeguest/hook/setup.c index 90c5d87afe..b217bd4b45 100644 --- a/tools/nativeguest/hook/setup.c +++ b/tools/nativeguest/hook/setup.c @@ -7,6 +7,9 @@ #ifndef DDNATV_HOST_TEST static char g_real_exe[PATH_MAX] = {0}; +// DDNATV_EXEC: the app's libddexec.so. A targetSdk 29+ app may not execve() its data files; this +// executable maps one and starts it as the kernel would ("libddexec.so [args...]"). +static char g_exec_loader[PATH_MAX] = {0}; // DDNATV_PRELOAD: guest paths of libraries every program loads before the hook (what // /etc/ld.so.preload does for programs run by the rootfs's own ld.so), and the same as host paths. static char *g_preload_guest = NULL; @@ -34,12 +37,14 @@ static void init_ddnatv_hook(void) { } } ddnatv_load_binds(getenv("DDNATV_BINDS")); + const char *exec_loader = getenv("DDNATV_EXEC"); + if (exec_loader && exec_loader[0] == '/' && strlen(exec_loader) < sizeof(g_exec_loader)) + ddnatv_copy_cstr(g_exec_loader, sizeof(g_exec_loader), exec_loader); const char *hostname = getenv("DDNATV_HOSTNAME"); if (hostname && hostname[0] && strlen(hostname) < sizeof(g_hostname)) ddnatv_copy_cstr(g_hostname, sizeof(g_hostname), hostname); const char *link_root = getenv("DDNATV_LINK_ROOT"); if (link_root && link_root[0] == '/' && strlen(link_root) < sizeof(g_link_root)) { - ddnatv_copy_cstr(g_link_root, sizeof(g_link_root), link_root); - g_link_root_len = strlen(g_link_root); + g_link_root_len = ddnatv_kernel_path(link_root, strlen(link_root), g_link_root, sizeof(g_link_root)); while (g_link_root_len > 1 && g_link_root[g_link_root_len - 1] == '/') g_link_root[--g_link_root_len] = 0; } const char *preload = getenv("DDNATV_PRELOAD"); diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index 6347023473..7593ff6a9e 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -3,8 +3,8 @@ Built by `tools/proot/build.sh` with the NDK on top of termux/proot `4dba3afb` (Termux's 5.1.107-70 package, the proot the Linux runtime ships at `opt/android-host/proot`; every `file.c:line` site in that binary matches this commit). talloc is linked in statically from -Samba's release tarball, so the apk carries one self-contained `libproot.so` plus -`libproot-loader.so`, and `LinuxRuntime` prefers them over the runtime's copy. +Samba's release tarball, so the proot add-on pack carries one self-contained `libproot.so`, which +Android's linker runs from app data, and the apk carries `libproot-loader.so`, which proot execs. Ported from WinNative (`feature/proot-enhancements`, e7af0f24): diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 2c6798664b..e2c11b6d43 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -17,8 +17,10 @@ PACKED = {'assets/linuxfs/usr/local/lib/droiddeck-xbox/': 'xbox', 'assets/linuxf 'assets/linuxfs/usr/local/lib/droiddeck-ubisoft/': 'ubisoft', 'assets/linuxfs/usr/local/lib/droiddeck-rockstar/': 'rockstar', 'assets/linuxfs/usr/local/lib/droiddeck-dirt/': 'dirt', 'assets/directaudio/': 'directaudio', 'assets/hybris/': 'powervr'} -PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'), - 'lib/arm64-v8a/libproot-loader.so': ('proot', 'libproot-loader.so')} +# DrWeb flags proot itself as Tool.Linux.Proot; the app runs the pack's copy through Android's linker. +PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so')} +# The loader is execve'd, which targetSdk 29+ allows only from the APK's native library directory. +PROOT_LOADER = {'lib/arm64-v8a/libproot-loader.so': 'libproot-loader.so'} PACKED_LIBRARIES = ['lib/arm64-v8a/libopencv_java4.so', 'lib/arm64-v8a/libmediapipe_tasks_jni.so'] PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr', 'ubisoft', 'rockstar', 'dirt'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', @@ -227,6 +229,9 @@ def check_apk(apk, root=ROOT): data = verify(root) packs = {name: pack_digests(root, name) for name in PACK_NAMES if name not in ('ubisoft', 'rockstar', 'dirt') or (root / PACKS / (name + '.tar.zst')).is_file()} + for name, rel in PROOT_LOADER.items(): + if packs['proot'].get(rel) != data['outputs'][name]['sha256']: + raise ValueError('Add-on pack proot is missing or has a stale ' + rel) with ZipFile(apk) as package: names = set(package.namelist()) for name in sorted(names): diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index ed1e00b181..954ea76f66 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -59,6 +59,8 @@ class RuntimeInputsTest(unittest.TestCase): proot = {} for name, (pack, rel) in runtime.PACKED_FILES.items(): proot[rel] = (self.root / runtime.outputs(self.root)[name]).read_bytes() + for name, rel in runtime.PROOT_LOADER.items(): + proot[rel] = (self.root / runtime.outputs(self.root)[name]).read_bytes() self.pack('proot', proot) self.pack('butler', {'butler': b'butler', '7z.so': b'7z', 'libc7zip.so': b'c7zip', 'version': b'15.32.0'}) for prefix, name in runtime.PACKED.items(): @@ -84,6 +86,19 @@ class RuntimeInputsTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'proot pack provides'): runtime.check_apk(apk, self.root) + def test_a_stale_proot_loader_in_the_pack_is_rejected(self): + apk = self.current_apk(self.root / 'current.apk') + loader = (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot-loader.so').read_bytes() + self.pack('proot', {'libproot.so': (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').read_bytes(), + 'libproot-loader.so': loader + b'older'}) + with self.assertRaisesRegex(ValueError, 'proot is missing or has a stale libproot-loader.so'): + runtime.check_apk(apk, self.root) + + def test_only_the_proot_loader_ships_in_the_apk(self): + self.assertFalse(self.in_apk('lib/arm64-v8a/libproot.so')) + self.assertTrue(self.in_apk('lib/arm64-v8a/libproot-loader.so')) + runtime.check_apk(self.current_apk(self.root / 'current.apk'), self.root) + def test_missing_proot_cannot_be_attested(self): (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').unlink() with self.assertRaisesRegex(ValueError, 'libproot.so'):