From ac8d97e098924548360aff1a8f8984d20e624887 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 28 Oct 2026 10:11:05 -0400 Subject: [PATCH] test(proot): target memory patch access denial --- tools/proot/bench/svc-fail.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/proot/bench/svc-fail.c b/tools/proot/bench/svc-fail.c index 94430bad4..3dcb8badf 100644 --- a/tools/proot/bench/svc-fail.c +++ b/tools/proot/bench/svc-fail.c @@ -6,11 +6,11 @@ int main(int argc, char **argv) { #if defined(__aarch64__) - assert(argc == 2 && fp_ready() && !svc_sites); + assert(argc == 2 && fp_ready() && !svc_sites && svc_single_thread()); int nr = !strcmp(argv[1], "mem") ? SYS_openat : !strcmp(argv[1], "write") ? SYS_pwrite64 : !strcmp(argv[1], "rx") ? SYS_mprotect : SYS_mmap; - unsigned offset = nr == SYS_mprotect ? offsetof(struct seccomp_data, args[2]) : offsetof(struct seccomp_data, args[3]); - unsigned mask = nr == SYS_mprotect ? PROT_EXEC : nr == SYS_mmap ? MAP_FIXED_NOREPLACE : ~0U; + unsigned offset = nr == SYS_mprotect || nr == SYS_openat ? offsetof(struct seccomp_data, args[2]) : offsetof(struct seccomp_data, args[3]); + unsigned mask = nr == SYS_mprotect ? PROT_EXEC : nr == SYS_mmap ? MAP_FIXED_NOREPLACE : nr == SYS_openat ? O_RDWR : ~0U; struct sock_filter code[] = { BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)), BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, nr, 0, 3), @@ -19,11 +19,12 @@ int main(int argc, char **argv) { BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ERRNO | EACCES), BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW), }; - if (nr == SYS_openat || nr == SYS_pwrite64) code[2] = (struct sock_filter)BPF_STMT(BPF_LD | BPF_IMM, 1); + if (nr == SYS_pwrite64) code[2] = (struct sock_filter)BPF_STMT(BPF_LD | BPF_IMM, 1); struct sock_fprog filter = {.len = sizeof code / sizeof *code, .filter = code}; assert(setenv("PROOT_FP_PATCH_SVC", "1", 1) == 0); if (sc(SYS_prctl, PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) || sc(SYS_prctl, PR_SET_SECCOMP, SECCOMP_MODE_FILTER, (long)&filter, 0, 0)) return 77; + assert(svc_single_thread()); svc_patch_init(); assert(svc_sites == 0 && svc_pages == 0); struct stat st;