diff options
| author | Alistair Delva <adelva@google.com> | 2023-02-23 10:12:32 -0800 |
|---|---|---|
| committer | Frederick Mayle <fmayle@google.com> | 2023-03-03 15:47:03 -0800 |
| commit | 50257f14c90656c2acaee1bf32a62fd5cd24385e (patch) | |
| tree | 6817e89beaff6fb238f43bfabefd3afc01d8890e | |
| parent | 18076dbcb31ffcc1636d5a703591d81f21705f27 (diff) | |
| download | minijail-50257f14c90656c2acaee1bf32a62fd5cd24385e.tar.gz | |
CHERRY-PICK: Extend host glibc workaround to userfaultfd
The minijail seccomp policies for crosvm now require `userfaultfd`.
Inspired by https://r.android.com/1887226
Test: TH
Test: built and ran a cuttlefish target with sandboxing enabled
Bug: 270439238
Change-Id: I4620d019e89c2d48a9647b6cce87d0674498e741
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/4287608
Auto-Submit: Alistair Delva <adelva@google.com>
Tested-by: Alistair Delva <adelva@google.com>
Reviewed-by: Frederick Mayle <fmayle@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alistair Delva <adelva@google.com>
| -rw-r--r-- | gen_syscalls-inl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gen_syscalls-inl.h b/gen_syscalls-inl.h index f885081..e631424 100644 --- a/gen_syscalls-inl.h +++ b/gen_syscalls-inl.h @@ -92,6 +92,16 @@ #define __NR_clone3 435 #endif +#ifndef __NR_userfaultfd +#ifdef __x86_64__ +#define __NR_userfaultfd 323 +#elif __i386__ +#define __NR_userfaultfd 374 +#elif __arm64__ +#define __NR_userfaultfd 282 +#endif +#endif /* __NR_userfaultfd */ + #ifndef __NR_membarrier #ifdef __x86_64__ #define __NR_membarrier 324 |