aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-19Snap for 7374840 from 696b45c2dd1729866bd723566b3ba625ec61a657 to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid-build-team Robot
Change-Id: I585a9612f3228c7ff306923139d0aa0d01ce5d8c
2021-05-13Add minijail_copy_jail am: 6dc224fbd5 am: f11bc7ed24 am: be7d912d94 am: ↵Dylan Reid
f58d5792e4 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1704166 Change-Id: Ie7c4b11c40c0ee37ad4e60e8dbcc710ef244d47e
2021-05-13Add minijail_copy_jail am: 6dc224fbd5 am: f11bc7ed24 am: be7d912d94android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devDylan Reid
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1704166 Change-Id: I129fa16327dde76dbfa69da22709432866f1feed
2021-05-13Add minijail_copy_jail am: 6dc224fbd5 am: f11bc7ed24Dylan Reid
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1704166 Change-Id: I2dc124a784f531d95c89837fc3a3f7705569f30b
2021-05-13Add minijail_copy_jail am: 6dc224fbd5Dylan Reid
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1704166 Change-Id: I954d37ed8a23a7ef39dbc017316082dd28a1767e
2021-05-12Add minijail_copy_jailDylan Reid
crosvm's main process sets up many identical jails. For example, by default there are four serial devices that use the same jail. Allowing a jail to be cloned places all that set up in one place. TEST=Added a marshall test as that infrastructure is re-used. BUG=b/187741537 Change-Id: I8743e35a47fb118d300e831d3dd6b5dc54cc7c34
2021-05-01Don't log the warning for an expected kill am: 1403606682 am: 7b8d84c130 am: ↵Victor Hsieh
9f3eb16c0f am: 2b0562127e Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1692726 Change-Id: I7da9d44ace9b612be9982903e3dd261a71d79f11
2021-05-01Don't log the warning for an expected kill am: 1403606682 am: 7b8d84c130 am: ↵Victor Hsieh
9f3eb16c0f Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1692726 Change-Id: I51b3cd6b172e7332848694abde9be5671f6c351b
2021-05-01Don't log the warning for an expected kill am: 1403606682 am: 7b8d84c130Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1692726 Change-Id: I46166159285c6d644cb29ced3f66de6774f865ea
2021-05-01Don't log the warning for an expected kill am: 1403606682Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1692726 Change-Id: I7fb3b3742d6fa9b7a0668b7556aac53c726b6034
2021-04-30Don't log the warning for an expected killVictor Hsieh
This is just to remove the log spam on the intentional kill like: libminijail[4120]: child process 4125 received signal 15 Bug: 171316742 Test: kill the jail with API, does not see warning Test: kill -9 from shell, still see the warning Change-Id: I5e9cb5637a539ce9a4cf3aa1d6ffd8750b46f881
2021-04-21rust/minijail: Fix cast to c_char. am: 11395a6982 am: 036c252f23 am: ↵Allen Webb
af243930d7 am: 23838c955e Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1682968 Change-Id: I10c4cde93f4387b38cebc27eb312b532491bf3eb
2021-04-21rust/minijail: Fix cast to c_char. am: 11395a6982 am: 036c252f23 am: af243930d7Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1682968 Change-Id: I0f06081d9db9e4bf0493f66ce76731c4807dd6c1
2021-04-21rust/minijail: Fix cast to c_char. am: 11395a6982 am: 036c252f23Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1682968 Change-Id: Ida3783af8ef71abc5e0bc80d5314aff23f978d74
2021-04-21rust/minijail: Fix cast to c_char. am: 11395a6982Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1682968 Change-Id: I230f0f45477c45183e250f24c682be04d976dd81
2021-04-21rust/minijail: Fix cast to c_char.Allen Webb
Original casts were to i8 but should have been to c_char. Bug: None Test: cargo test -- --test-threads=1 Change-Id: I77fe69a0b6c1ede60dd5d81e56567dab090c6e8a
2021-04-20Make run/run_remap more generic am: f16b78b423 am: 4f4c093869 am: a3f4caae38 ↵Victor Hsieh
am: 07e83986ab Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675960 Change-Id: I30150f67f85a547e0d53969709548d0770b1ac70
2021-04-20Make run/run_remap more generic am: f16b78b423 am: 4f4c093869 am: a3f4caae38Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675960 Change-Id: I980ce21a8b85a78c009777f3357bac0c3bd88e59
2021-04-20Make run/run_remap more generic am: f16b78b423 am: 4f4c093869Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675960 Change-Id: I5f59f33d407e340d31c8a00d2c3c41fb514ad986
2021-04-20Make run/run_remap more generic am: f16b78b423Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675960 Change-Id: I7c3c5267a13a5b565731388e7ef47aab90c2d38f
2021-04-20Make run/run_remap more genericVictor Hsieh
For example, this allows the caller to pass &[String] instead of only &[&str]. Bug: None Test: cargo test Change-Id: I0e47a5a5f04a0983572031bcf609032077bc943f
2021-04-20Add overlap handling to redirect_fds(). am: c718268549 am: b4848039ee am: ↵Allen Webb
4b324e8442 am: 82c0f84acd Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675393 Change-Id: Icaa1ea83b3be83a7e092f5f14d6e182ca1807287
2021-04-20Move OWNERS.rust to rust/OWNERS. am: 2a227b73e8 am: fc030a1868 am: ↵Allen Webb
9976a9ab84 am: 5f80242080 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1680465 Change-Id: Ib20e5d3826f822c0a7540347d5876c7f542340b2
2021-04-19Add overlap handling to redirect_fds(). am: c718268549 am: b4848039ee am: ↵Allen Webb
4b324e8442 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675393 Change-Id: I153ee14ad711bf93b7862f494d02ae71c7bbef10
2021-04-19Move OWNERS.rust to rust/OWNERS. am: 2a227b73e8 am: fc030a1868 am: 9976a9ab84Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1680465 Change-Id: I1a261af955aea2499529b264ae482289395015b6
2021-04-19Add overlap handling to redirect_fds(). am: c718268549 am: b4848039eeAllen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675393 Change-Id: Iae800936bbfa519aa243da17bbe403ca3a628938
2021-04-19Move OWNERS.rust to rust/OWNERS. am: 2a227b73e8 am: fc030a1868Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1680465 Change-Id: I2a6dfc30fcb310c0b03b244094d2230133afb405
2021-04-19Add overlap handling to redirect_fds(). am: c718268549Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675393 Change-Id: I2c3896fdf089e94f409955add1f2509e632328ff
2021-04-19Add overlap handling to redirect_fds().Allen Webb
Previously redirect_fds would clobber mapping source fds if the destination of a previous mapping collided. This change adds detection of these collisions and handles it by mapping them ahead of time when possible or mapping to a temporary otherwise. It also cleans up some badness in the Rust wrapper that was closing file descriptors already closed by libminijail, and updates the fork_remap test to make it easier to debug. Bug: 185349327 Test: cargo test -- --test-threads=1 Change-Id: I637846dfbe73b73dbb5d218bcfc8464c0cd7d3b4
2021-04-19Move OWNERS.rust to rust/OWNERS. am: 2a227b73e8Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1680465 Change-Id: I93dc51ec85fce4d376032ba947ebda2510516819
2021-04-19Move OWNERS.rust to rust/OWNERS.Allen Webb
The previous attempted fix did not work on the AOSP gerrit. Bug: none Test: Check the suggested owners on a minijail/rust CL. Change-Id: Idcccf70ce1057401efe23d94691c47d011d0165b
2021-04-19rust/minijail: Allow more flexible args than `&Path` am: 96cd7ccaa9 am: ↵Dylan Reid
42bf660f35 am: 15b8128a12 am: 16bcf39c66 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1671673 Change-Id: I3dae68cb0e06448880d1e09aa855abdb515da648
2021-04-19rust/minijail: Allow more flexible args than `&Path` am: 96cd7ccaa9 am: ↵Dylan Reid
42bf660f35 am: 15b8128a12 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1671673 Change-Id: Ibc6d2a90c4eab69c27a1d4e72749a03687d9fdc9
2021-04-19Android: update C std to gnu11 am: 32a3b69aec am: 5dce5bc2f0 am: 1bdec1da32 ↵Mike Frysinger
am: c42f1362d7 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1676907 Change-Id: Ia7c430b4ca8ae4add6031289f4e442c1e48566a6
2021-04-19rust/minijail: Allow more flexible args than `&Path` am: 96cd7ccaa9 am: ↵Dylan Reid
42bf660f35 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1671673 Change-Id: I9f3702edf384cb08a35b4a8cd194d51155ae815a
2021-04-19rust/minijail: Allow more flexible args than `&Path` am: 96cd7ccaa9Dylan Reid
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1671673 Change-Id: Ibc23eb293a7378490103da607d87f0b94cfcf82e
2021-04-19Android: update C std to gnu11 am: 32a3b69aec am: 5dce5bc2f0 am: 1bdec1da32Mike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1676907 Change-Id: Ia90645556ad9f6188a4104294ddd23e60438c33a
2021-04-19rust/minijail: Allow more flexible args than `&Path`Dylan Reid
Instead of taking a `&Path` for the path to directories, take `AsRef<Path>`. This way users can pass `PathBuf`, `Path`, `String`, or `&str`. This makes things easier as can be seen in the test changes. Bug: none Test: Cargo test here and crosvm Change-Id: Ib9a272e8f1992c991e222cc6c6f41406bbe52b7c
2021-04-19Android: update C std to gnu11 am: 32a3b69aec am: 5dce5bc2f0Mike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1676907 Change-Id: I9853da06b61950603f57c89a5fa1ed9f10aed4f6
2021-04-19Android: update C std to gnu11 am: 32a3b69aecMike Frysinger
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1676907 Change-Id: Ic625607c4bdcc55fc46940f50704ae203c1e975c
2021-04-17Android: update C std to gnu11Mike Frysinger
This matches what we use in CrOS. Bug: None Test: CQ passes Change-Id: Id9b8dc339ed23af01adaa3cb21caf3bfe1108c01
2021-04-16Fix usage of OWNERS.rust. am: bd99fbb19c am: bf82f93123 am: fa2dc83765 am: ↵Allen Webb
77642facca Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1678225 Change-Id: Ib3eb8c19eda7167140ca2230ec9df1868eecb48d
2021-04-16Fix usage of OWNERS.rust. am: bd99fbb19c am: bf82f93123 am: fa2dc83765Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1678225 Change-Id: I5132174b9371913637f73c245769f18c67d34ef1
2021-04-16Fix usage of OWNERS.rust. am: bd99fbb19c am: bf82f93123Allen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1678225 Change-Id: Ice630b831a9a678262ec399b3b6f9ff3fc0d8b65
2021-04-16Add kill function am: ab5fdce629 am: 12df15ecef am: a68a03fd31 am: 43046804aaVictor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675957 Change-Id: I1862f8fcde6774feba7d4cf6c32bf8b095d7454f
2021-04-16Fix usage of OWNERS.rust. am: bd99fbb19cAllen Webb
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1678225 Change-Id: I9cf4c27e52e1286ef22351ef946c8a6a903b063f
2021-04-16Fix usage of OWNERS.rust.Allen Webb
Bug: none Test: ls rust/** Change-Id: I8c6ccd27579b4961ca6e80e3013e2c9dd7262a6e
2021-04-16Add kill function am: ab5fdce629 am: 12df15ecef am: a68a03fd31Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675957 Change-Id: I96ec40141cce655509c747471272187f55ca2fd5
2021-04-16Add kill function am: ab5fdce629 am: 12df15ecefVictor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675957 Change-Id: I6045576f957bf9e1d6d3498e22e1d0816b219ef1
2021-04-16Add kill function am: ab5fdce629Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1675957 Change-Id: Iff0fd076c51f47a8a907e682fca85758a4ba15a2