| commit | 18076dbcb31ffcc1636d5a703591d81f21705f27 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <[email protected]> | Fri Oct 28 10:43:59 2022 -0700 |
| committer | Frederick Mayle <[email protected]> | Fri Mar 03 15:45:40 2023 -0800 |
| tree | bc1ce8880b80c1291f6b864f47711d6bfbe242c7 | |
| parent | 3c6795b8906b224736c9eb914dd9bf50204f52c7 [diff] |
CHERRY-PICK: Fix "Extend host glibc workaround to clone3" The workaround was applied inside a conditional for __NR_rseq which meant it would not take effect if used against a glibc with rseq but not clone3, such as the one in Debian 10. Test: local Bug: 246990922 Change-Id: I52e5be3d489c08e527211ab48848e73aabbbca2a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/3989233 Auto-Submit: Alistair Delva <[email protected]> Tested-by: Alistair Delva <[email protected]> Commit-Queue: Alistair Delva <[email protected]> Reviewed-by: Allen Webb <[email protected]> Reviewed-by: Frederick Mayle <[email protected]>
diff --git a/gen_syscalls-inl.h b/gen_syscalls-inl.h index aee71e2..f885081 100644 --- a/gen_syscalls-inl.h +++ b/gen_syscalls-inl.h
@@ -86,13 +86,12 @@ #elif __arm64__ #define __NR_rseq 293 #endif +#endif /* __NR_rseq */ #ifndef __NR_clone3 #define __NR_clone3 435 #endif -#endif /* __NR_rseq */ - #ifndef __NR_membarrier #ifdef __x86_64__ #define __NR_membarrier 324