commit | 50257f14c90656c2acaee1bf32a62fd5cd24385e | [log] [tgz] |
---|---|---|
author | Alistair Delva <[email protected]> | Thu Feb 23 10:12:32 2023 -0800 |
committer | Frederick Mayle <[email protected]> | Fri Mar 03 15:47:03 2023 -0800 |
tree | 6817e89beaff6fb238f43bfabefd3afc01d8890e | |
parent | 18076dbcb31ffcc1636d5a703591d81f21705f27 [diff] |
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 <[email protected]> Tested-by: Alistair Delva <[email protected]> Reviewed-by: Frederick Mayle <[email protected]> Reviewed-by: Mike Frysinger <[email protected]> Commit-Queue: Alistair Delva <[email protected]>
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