mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 21:35:59 +00:00
FEX: preload the fault report only where x86 loaders look (#551)
Preload the FEX fault report only where x86 loaders look droiddeck-fex put the x86 libfaultreport.so in LD_PRELOAD, which FEX's own arm64 loader reads too - and FEXServer's, and every child FEX's - so each x86 start printed "ERROR: ld.so: object '.../libfaultreport.so' from LD_PRELOAD cannot be preloaded", and an i386 child added "wrong ELF class". It is now listed in the x86 runtime's own /etc/ld.so.preload, which only the loaders inside FEX read, as /usr/$LIB/droiddeck/libfaultreport.so. faultreport.c builds for i386 too, so 32-bit programs get the report as well instead of an error.
This commit is contained in:
1 parent
2a06204eb4
commit
d45933e559
7 files changed
+104
-23
No files matched your search
@@ -198,12 +198,10 @@ class PrepareTest(FexTestCase):
|
||||
for arch in ("x86_64", "i386"):
|
||||
for name in ("libblsession.so", "libfakeinput.so"):
|
||||
self.write(self.tmp / "preloads" / arch / name, arch.encode() + name.encode())
|
||||
self.write(self.tmp / "preloads/x86_64/libfaultreport.so", b"report")
|
||||
self.write(self.tmp / "preloads/x86_64/libthunkaudit.so", b"audit")
|
||||
self.write(self.tmp / "preloads/x86_64/libvulkan-thunk.so", b"pin")
|
||||
self.write(self.tmp / "ld.so.preload", "/usr/local/lib/libblsession.so\n/usr/local/lib/libfakeinput.so\n")
|
||||
FEX["install_preloads"](str(root))
|
||||
self.assertEqual((root / "lib/x86_64-linux-gnu/droiddeck/libfaultreport.so").read_bytes(), b"report")
|
||||
self.assertEqual((root / "lib/x86_64-linux-gnu/droiddeck/libthunkaudit.so").read_bytes(), b"audit")
|
||||
self.assertEqual((root / "lib/x86_64-linux-gnu/droiddeck/libvulkan-thunk.so").read_bytes(), b"pin")
|
||||
self.assertEqual((root / "etc/ld.so.preload").read_text(),
|
||||
@@ -213,6 +211,17 @@ class PrepareTest(FexTestCase):
|
||||
FEX["install_preloads"](str(root))
|
||||
self.assertEqual((root / "etc/ld.so.preload").read_text(), "/usr/$LIB/droiddeck/libblsession.so\n")
|
||||
|
||||
def test_only_x86_loaders_preload_the_fault_report(self):
|
||||
root = self.tmp / "root"
|
||||
self.write(self.tmp / "preloads/x86_64/libfaultreport.so", b"report64")
|
||||
FEX["install_preloads"](str(root))
|
||||
self.assertNotIn("libfaultreport.so", (root / "etc/ld.so.preload").read_text())
|
||||
self.write(self.tmp / "preloads/i386/libfaultreport.so", b"report32")
|
||||
FEX["install_preloads"](str(root))
|
||||
self.assertEqual((root / "lib/x86_64-linux-gnu/droiddeck/libfaultreport.so").read_bytes(), b"report64")
|
||||
self.assertEqual((root / "lib/i386-linux-gnu/droiddeck/libfaultreport.so").read_bytes(), b"report32")
|
||||
self.assertEqual((root / "etc/ld.so.preload").read_text(), "/usr/$LIB/droiddeck/libfaultreport.so\n")
|
||||
|
||||
def test_config_turns_thunks_on_only_when_complete(self):
|
||||
FEX["write_config"]({"host_thunks": "/h", "guest_thunks": "/g", "thunks_db": "/db"}, "/root")
|
||||
config = json.loads((self.home / ".local/share/droiddeck-fex/config/Config.json").read_text())
|
||||
@@ -385,11 +394,12 @@ class LaunchTest(FexTestCase):
|
||||
self.assertEqual(env["FEX_PORTABLE"], "1")
|
||||
self.assertNotIn("LD_PRELOAD", env)
|
||||
self.assertEqual(env["FEX_ROOTFS"], str(self.steam / "steamapps/common/SteamLinuxRuntime_sniper/sniper_platform_3.0.20260805.254768/files"))
|
||||
self.write(self.tmp / "preloads/x86_64/libfaultreport.so", elf(62))
|
||||
for arch in ("x86_64", "i386"):
|
||||
self.write(self.tmp / "preloads" / arch / "libfaultreport.so", elf(62 if arch == "x86_64" else 3))
|
||||
x86 = self.write(self.tmp / "x86.so", elf(62))
|
||||
with mock.patch("os.execve") as emulated:
|
||||
self.quiet(FEX["launch"], [str(program)], {"LD_PRELOAD": str(x86)}, "auto")
|
||||
self.assertEqual(emulated.call_args[0][2]["LD_PRELOAD"], "/usr/lib/x86_64-linux-gnu/droiddeck/libfaultreport.so:%s" % x86)
|
||||
self.assertEqual(emulated.call_args[0][2]["LD_PRELOAD"], str(x86))
|
||||
old = self.write(self.tmp / "game.i386", elf(3), 0o755)
|
||||
with mock.patch("os.execve") as emulated:
|
||||
self.quiet(FEX["launch"], [str(old)], {}, "auto")
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
SOURCE = Path(__file__).resolve().parents[1] / "linuxfs/fex/faultreport.c"
|
||||
PROGRAM = 'int main(void) { __asm__ volatile("ud2"); return 0; }\n'
|
||||
FLAGS = ["-shared", "-fPIC", "-O2", "-Wall", "-Wextra", "-Werror", "-nostdlib", "-fno-stack-protector", "-fno-builtin",
|
||||
"-fvisibility=hidden"]
|
||||
|
||||
|
||||
@unittest.skipUnless(shutil.which("gcc") and os.uname().machine == "x86_64", "needs gcc on an x86-64 host")
|
||||
class FaultReportTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.tmp = Path(tempfile.mkdtemp())
|
||||
self.addCleanup(shutil.rmtree, self.tmp, ignore_errors=True)
|
||||
(self.tmp / "program.c").write_text(PROGRAM)
|
||||
|
||||
def build(self, bits):
|
||||
library, program = self.tmp / ("libfaultreport%s.so" % bits), self.tmp / ("program%s" % bits)
|
||||
if subprocess.run(["gcc", "-m" + bits, "-o", str(program), str(self.tmp / "program.c")], capture_output=True).returncode:
|
||||
self.skipTest("gcc cannot build %s-bit programs here" % bits)
|
||||
made = subprocess.run(["gcc", "-m" + bits] + FLAGS + ["-o", str(library), str(SOURCE)], capture_output=True, text=True)
|
||||
self.assertEqual(made.returncode, 0, made.stderr)
|
||||
return library, program
|
||||
|
||||
def check(self, bits):
|
||||
library, program = self.build(bits)
|
||||
result = subprocess.run([str(program)], env=dict(os.environ, LD_PRELOAD=str(library)), capture_output=True, text=True)
|
||||
self.assertEqual(result.returncode, -4)
|
||||
self.assertRegex(result.stderr, r"droiddeck-fex: SIGILL at 0x[0-9a-f]+ \(si_code 02\), offset 0x[0-9a-f]+, bytes 0f 0b ")
|
||||
self.assertIn("program%s" % bits, result.stderr)
|
||||
|
||||
def test_an_x86_64_program_reports_its_illegal_instruction(self):
|
||||
self.check("64")
|
||||
|
||||
def test_an_i386_program_reports_its_illegal_instruction(self):
|
||||
self.check("32")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user