Auto merge of rust-lang#2687 - RalfJung:getrandom, r=RalfJung

ensure current getrandom works with strict provenance
Aaron1011 · Nov 22, 2022 · b655795 · b655795
2 parents 435faf0 + c2f872e
commit b655795
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 49 deletions.
diff --git a/test_dependencies/Cargo.lock b/test_dependencies/Cargo.lock
diff --git a/test_dependencies/Cargo.toml b/test_dependencies/Cargo.toml
@@ -11,11 +11,11 @@ edition = "2021"
 # all dependencies (and their transitive ones) listed here can be used in `tests/`.
 tokio = { version = "1.0", features = ["full"] }
 libc = "0.2"
-page_size = "0.4.1"
+page_size = "0.5"
 num_cpus = "1.10.1"
 
 getrandom_1 = { package = "getrandom", version = "0.1" }
-getrandom_2 = { package = "getrandom", version = "0.2" }
+getrandom = { version = "0.2" }
 rand = { version = "0.8", features = ["small_rng"] }
 
 [workspace]
diff --git a/tests/fail/crates/tokio_mvp.stderr b/tests/fail/crates/tokio_mvp.stderr
@@ -1,8 +1,8 @@
 error: unsupported operation: can't call foreign function: epoll_create1
   --> CARGO_REGISTRY/.../epoll.rs:LL:CC
    |
-LL |         syscall!(epoll_create1(flag)).map(|ep| Selector {
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't call foreign function: epoll_create1
+LL |         let res = syscall!(epoll_create1(libc::EPOLL_CLOEXEC));
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't call foreign function: epoll_create1
    |
    = help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
    = note: BACKTRACE:

diff --git a/tests/pass-dep/getrandom_1.rs b/tests/pass-dep/getrandom_1.rs
@@ -0,0 +1,8 @@
+// mac-os `getrandom_1` does some pointer shenanigans
+//@compile-flags: -Zmiri-permissive-provenance
+
+/// Test old version of `getrandom`.
+fn main() {
+    let mut data = vec![0; 16];
+    getrandom_1::getrandom(&mut data).unwrap();
+}
diff --git a/tests/pass-dep/random.rs b/tests/pass-dep/random.rs
@@ -1,12 +1,10 @@
-// mac-os `getrandom_1` does some pointer shenanigans
-//@compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-strict-provenance
 use rand::{rngs::SmallRng, Rng, SeedableRng};
 
 fn main() {
-    // Test `getrandom` directly (in multiple different versions).
+    // Test `getrandom` directly.
     let mut data = vec![0; 16];
-    getrandom_1::getrandom(&mut data).unwrap();
-    getrandom_2::getrandom(&mut data).unwrap();
+    getrandom::getrandom(&mut data).unwrap();
 
     // Try seeding with "real" entropy.
     let mut rng = SmallRng::from_entropy();

diff --git a/...hims/linux-getrandom-without-isolation.rs → ...shims/libc-getrandom-without-isolation.rs b/...hims/linux-getrandom-without-isolation.rs → ...shims/libc-getrandom-without-isolation.rs
diff --git a/tests/pass-dep/shims/linux-getrandom.rs → tests/pass-dep/shims/libc-getrandom.rs b/tests/pass-dep/shims/linux-getrandom.rs → tests/pass-dep/shims/libc-getrandom.rs