aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-08rust: remove redundant format in unreachable am: ff062d54f9 am: 7d8dde4b8f ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseDaniel Verkamp
am: 2d4d0158ac am: 0a1a6fd4ae am: c4744ab7c4 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2058807 Change-Id: I189c1f1a48ba08d9d17129215cfd59f398ec89f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08rust: remove redundant format in unreachable am: ff062d54f9 am: 7d8dde4b8f ↵Daniel Verkamp
am: 2d4d0158ac am: 0a1a6fd4ae Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2058807 Change-Id: I7beae46fe3c8eef08ed1547c8bc17cfeb60578ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08rust: remove redundant format in unreachable am: ff062d54f9 am: 7d8dde4b8f ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devDaniel Verkamp
am: 2d4d0158ac Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2058807 Change-Id: If0f66e449b9dcadc0b471bcba6ee7fbadea88acc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08rust: remove redundant format in unreachable am: ff062d54f9 am: 7d8dde4b8fDaniel Verkamp
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2058807 Change-Id: I142d5e933148c6e7b65ab62179cd092382ea6f22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08rust: remove redundant format in unreachable am: ff062d54f9Daniel Verkamp
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2058807 Change-Id: Ie23117fdba47ac9c3df7305fbb9e758d32be11f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07rust: remove redundant format in unreachableDaniel Verkamp
The unreachable macro already supports formatting, and this is now a warning as of Rust 1.60.0: https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html Bug: None Test: cargo test Change-Id: Id86367b7a6f65f4a4348ee4e20e29ccc11a2e1d6
2022-03-24Add OWNERS_GENERAL so it can be inherited without 'no parent' am: 6de291f22b ↵Allen Webb
am: 95eb583fbe am: 38cb22e7ce Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2039165 Change-Id: Ic3a466816e369a61ea4b9da24398a92413fbff37
2022-03-23Add OWNERS_GENERAL so it can be inherited without 'no parent' am: 6de291f22b ↵Allen Webb
am: 95eb583fbe Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2039165 Change-Id: I4bf024bf5b31660bbfc92fd717c4b7ca2f3dd9ee
2022-03-23Add OWNERS_GENERAL so it can be inherited without 'no parent' am: 6de291f22bAllen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2039165 Change-Id: Ic566c63b8d7e53be628f2b57ebc91b083e4aba3f
2022-03-23Add OWNERS_GENERAL so it can be inherited without 'no parent'Allen Webb
OWNERS sets 'no parent' which may not be wanted when inheriting outside this project, so put the actual list in OWNERS.general. Bug: None Test: repo upload . Change-Id: Ibb555096b678a8eea58997bf3595369752619519
2022-03-21libminijail: Set the controlling tty if appropriate. am: f486e262fa am: ↵Allen Webb
c4dbc7cde8 am: e564e85bec Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2032023 Change-Id: I35eeec3647aa5c326a3f8b86e7a4fb5ed5f94e77
2022-03-21libminijail: Set the controlling tty if appropriate. am: f486e262fa am: ↵Allen Webb
c4dbc7cde8 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2032023 Change-Id: Icd58c80db8c93d806c367d50521985aece187244
2022-03-21libminijail: Set the controlling tty if appropriate. am: f486e262faAllen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2032023 Change-Id: I4ba85e388eacd367e329ef3140301dfe4c302ff8
2022-03-21libminijail: Set the controlling tty if appropriate.Allen Webb
The session leader needs to set the controlling tty for job control to work. Also, clang-format was applied to libminijail.c. Bug: 224419467 Test: manatee -a shell # check if job control fails Change-Id: Ib935d3dbca384ffb071e902b3aed232334be8318
2022-03-19tools/compile_seccomp_policy: align BPF buffer am: 7e146a20db am: a42d408afc ↵Daniel Verkamp
am: a8485bef11 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1852508 Change-Id: I3031dc76c3b5c11d0ce8571668d3ab15503ebaa1
2022-03-19tools/compile_seccomp_policy: align BPF buffer am: 7e146a20db am: a42d408afcDaniel Verkamp
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1852508 Change-Id: I72facc6e6627a897acc1646baad2760a839a7088
2022-03-19tools/compile_seccomp_policy: align BPF buffer am: 7e146a20dbDaniel Verkamp
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1852508 Change-Id: I87707690e455be8978e71459ceff7827c8f97312
2022-03-19tools/compile_seccomp_policy: align BPF bufferDaniel Verkamp
The BPF opcodes emitted by the --output-header-file option are stored in an array of unsigned char, but if other code accesses the data as an array of struct sock_filter, the alignment of the buffer may not be sufficient. Since struct sock_filter contains a __u32 field, its natural alignment is 4 bytes, so add an align(4) attribute. Change-Id: Ic8b2c9d4c7cbdcfc6b69d49c24fa21485fc6a04b Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
2022-03-18Add minijail to hwasan-postsubmit. am: 7587aa062d am: e4966f1fe6 am: 67d0658194Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2028835 Change-Id: I0c72c04c35c88cb7910423a223ae499a0a62fd8b
2022-03-18Add minijail to hwasan-postsubmit. am: 7587aa062d am: e4966f1fe6Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2028835 Change-Id: Ia0a65efc2dc21c7f2ec24269261176ef52e3bc6d
2022-03-18Add minijail to hwasan-postsubmit. am: 7587aa062dFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2028835 Change-Id: I0e1c284065e2ccd9ccdcd0b36acde995d85a663a
2022-03-17Add minijail to hwasan-postsubmit.Florian Mayer
Change-Id: I0b21f30550a337d8a8ea4d4c6f52587a8b22351c Test: Run tests under HWASan. Bug: 193568145
2022-03-02rust/minijail: add API to parse raw BPF bytes am: c97c0be9c1 am: 68c53b560b ↵Daniel Verkamp
am: 90048631da Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2004892 Change-Id: I14c10f1234f81405a12b3d1bfff1af182794aa56
2022-03-02rust/minijail: add API to parse raw BPF bytes am: c97c0be9c1 am: 68c53b560bDaniel Verkamp
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2004892 Change-Id: Iec776b399c424d4a7a4b52d193b50ec7ba54e2f6
2022-03-02rust/minijail: add API to parse raw BPF bytes am: c97c0be9c1Daniel Verkamp
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2004892 Change-Id: I9638e496d64a953aa1001ee63e72a14d25ada34d
2022-03-01rust/minijail: add API to parse raw BPF bytesDaniel Verkamp
This can be used to parse a policy that is included directly in a binary rather than as a separate file. Bug: chromium:1052126 Test: cargo test Change-Id: I8fd4058cc891755b536c53ad3b9f6128dc9f1988
2022-02-18style: fix const char array definitions am: 96db6fc8b6 am: 2949aa97d4 am: ↵Zi Lin
2adcad6a9e Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1991210 Change-Id: Ib05c2c0b81eb2c5a248295bbfb1bcfc5ebeb262e
2022-02-18README: update tast test targets am: e51526ce3d am: c92eb73392 am: 5209cc0f36Zi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1989033 Change-Id: Ibb28b3bade81e89c469c69afc00fe8d28e90eeee
2022-02-18style: fix const char array definitions am: 96db6fc8b6 am: 2949aa97d4Zi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1991210 Change-Id: I437c00e84c87021c0cf30ef66d9ee49d857ddd68
2022-02-18README: update tast test targets am: e51526ce3d am: c92eb73392Zi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1989033 Change-Id: I576c652896db0a098defe844afa511e80c447061
2022-02-17style: fix const char array definitions am: 96db6fc8b6Zi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1991210 Change-Id: I1dbada5a696a863700112cd14a569a2bc4a8fc26
2022-02-17README: update tast test targets am: e51526ce3dZi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1989033 Change-Id: Ibbb1e2a14217c96c63a1813163ab5f5e3f232aee
2022-02-17style: fix const char array definitionsZi Lin
Bug: None Test: Unit tests, 'make all tests' Change-Id: I8c657a0a3e0742fb84a6b30ef0ce96997f039e3a
2022-02-16README: update tast test targetsZi Lin
Bug: None Test: Tast tests Change-Id: I0d34aed651a808fa878846104604cb803bd5d0cb
2022-02-16Makefile: revert the usage of $(ECHO) temporarily. am: 138761fdcc am: ↵Zi Lin
fbdbf7d44b am: 43529d8d29 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1978848 Change-Id: I44175f5683f06fae8820a12c37d3451ce731b781
2022-02-16Makefile: revert the usage of $(ECHO) temporarily. am: 138761fdcc am: fbdbf7d44bZi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1978848 Change-Id: Id690139bfef67ab31fdcd96804eb7ac105481afd
2022-02-16Makefile: revert the usage of $(ECHO) temporarily. am: 138761fdccZi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1978848 Change-Id: Ic024482e62ed714ee8134a8a9eb92b482a701956
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1645222803 -s ours am: 59e7797500 -s ours am skip reason: Merged-In I899c8cf7501b64e7c6886951af3672b911ca2378 with SHA-1 a9e7226127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minijail/+/16843670 Change-Id: If118a990987c3b4a970b350c98244acc0362f4c5
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1645222803 -s ours am skip reason: Merged-In I899c8cf7501b64e7c6886951af3672b911ca2378 with SHA-1 a9e7226127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minijail/+/16843670 Change-Id: Ic996061ecf8c165b6f0139979dde32eb5d4be03a
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I899c8cf7501b64e7c6886951af3672b911ca2378 Change-Id: I004b5b8194c00196db790ad007cddc675dcac73c
2022-02-09Makefile: revert the usage of $(ECHO) temporarily.Zi Lin
The usage of $(ECHO) causes 'make all' to fail: For some reason, make attempts to resolve the first target before carrying out the recipes defined in the match-all rule injected by common.mk. While we investigate how to fix the problem, revert the usage of $(ECHO) so it is not blocking any build scripts that uses 'make all'. Bug: 218368855 Test: make clean && make all Change-Id: I3cf54d840549cfd71712e945b7bd518f52e008f1
2022-01-31cli: add a new long option '--ns-mount', equivalent to '-v'. am: c628910028 ↵Zi Lin
am: 5b0027d5ed am: d7f65e0f0a am: 64b9dfb643 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1966819 Change-Id: I0370da40c98cbd316c3173e9c308d5e85a5b9862
2022-01-31cli: add a new long option '--ns-mount', equivalent to '-v'. am: c628910028 ↵Zi Lin
am: 5b0027d5ed am: d7f65e0f0a Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1966819 Change-Id: I122e4553b5700315b59ba996aa0f9890458e9210
2022-01-31cli: add a new long option '--ns-mount', equivalent to '-v'. am: c628910028 ↵Zi Lin
am: 5b0027d5ed Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1966819 Change-Id: I8fe1a29133821cc3d83354fee12593e9c6290a37
2022-01-31cli: add a new long option '--ns-mount', equivalent to '-v'. am: c628910028Zi Lin
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1966819 Change-Id: I74fe036d4e769313a3becd957eb69b8e042a90fd
2022-01-31cli: add a new long option '--ns-mount', equivalent to '-v'.android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Zi Lin
This also enables having 'ns-mount' in the conf file. This change helps to create a self-contained conf file for mounts and bind-mounts. Our first target use of conf file is moving '-b' and '-k' options in the cli to a file with 'bind-mount=...' and 'mount=...'. Bug: 216345755 Test: Make tests, inspected "man -l minijail0.1" Change-Id: Ib4a599d4fe8e6506d268356471ec151eed9f7490
2022-01-27minijail0: implement --env-reset and --env-add am: f65da3a91d am: 4f9480f394 ↵Stéphane Lesimple
am: 2257dd27b6 am: 12835df0a5 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1217602 Change-Id: I6e0cb4bec4e484cd12b1a393ba909df761b7a752
2022-01-27minijail0: implement --env-reset and --env-add am: f65da3a91d am: 4f9480f394 ↵Stéphane Lesimple
am: 2257dd27b6 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1217602 Change-Id: I342479818801af71af7af3e99da52a3d48574865
2022-01-27minijail0: implement --env-reset and --env-add am: f65da3a91d am: 4f9480f394Stéphane Lesimple
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1217602 Change-Id: Ib754e15407397461a8eca78124558e6cc530cdf9
2022-01-27minijail0: implement --env-reset and --env-add am: f65da3a91dStéphane Lesimple
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1217602 Change-Id: If0b625102850916911d9f94559c43634f212761e