diff options
| author | Andrew Walbran <qwandor@google.com> | 2020-07-09 16:22:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 16:22:50 +0000 |
| commit | 751025030dfc4a298f7cebedc6af09bd4d626757 (patch) | |
| tree | 720079c5f277235567718ebdb1c7ea708e3a1fee | |
| parent | 3ad77317999c618a3972a0734d1ac6fdd44d4f9b (diff) | |
| parent | ef47ac9948aed8dce5d011e249f12a35fc7bb4e7 (diff) | |
| download | platform_external_minijail-751025030dfc4a298f7cebedc6af09bd4d626757.tar.gz platform_external_minijail-751025030dfc4a298f7cebedc6af09bd4d626757.tar.bz2 platform_external_minijail-751025030dfc4a298f7cebedc6af09bd4d626757.zip | |
rust/minijail: Use minijail_sys::rlim_t instead of libc::rlim64_t. am: f95f8cb586 am: ef47ac9948
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1355741
Change-Id: I3097c64e2192193394bc9d8073441e85f4ae4d6b
| -rw-r--r-- | rust/minijail/Cargo.toml | 2 | ||||
| -rw-r--r-- | rust/minijail/src/lib.rs | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/rust/minijail/Cargo.toml b/rust/minijail/Cargo.toml index 4793f444..83157e4d 100644 --- a/rust/minijail/Cargo.toml +++ b/rust/minijail/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minijail" -version = "0.1.0" +version = "0.2.0" description = "Provides a safe Rust friendly interface to libminijail." authors = ["The Chromium OS Authors"] edition = "2018" diff --git a/rust/minijail/src/lib.rs b/rust/minijail/src/lib.rs index 958d8417..66001eae 100644 --- a/rust/minijail/src/lib.rs +++ b/rust/minijail/src/lib.rs @@ -247,12 +247,10 @@ impl Minijail { minijail_keep_supplementary_gids(self.jail); } } - pub fn set_rlimit( - &mut self, - kind: libc::c_int, - cur: libc::rlim64_t, - max: libc::rlim64_t, - ) -> Result<()> { + // rlim_t is defined in minijail-sys to be u64 on all platforms, to avoid + // issues on 32-bit platforms. It's also useful to us here to avoid + // libc::rlim64_t, which is not defined at all on Android. + pub fn set_rlimit(&mut self, kind: libc::c_int, cur: rlim_t, max: rlim_t) -> Result<()> { let errno = unsafe { minijail_rlimit(self.jail, kind, cur, max) }; if errno == 0 { Ok(()) |