Skip to content

Commit

Permalink
linux: try to use libc getrandom to allow interposition
Browse files Browse the repository at this point in the history
We'll try to use a weak `getrandom` symbol first, because that allows
things like `LD_PRELOAD` interposition. For example, perf measurements
might want to disable randomness to get reproducible results. If the
weak symbol is not found, we fall back to a raw `SYS_getrandom` call.
  • Loading branch information
cuviper committed Nov 16, 2020
1 parent f5230fb commit 7a15f02
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 5 deletions.
15 changes: 12 additions & 3 deletions library/std/src/sys/unix/rand.rs
Expand Up @@ -25,10 +25,19 @@ mod imp {
use crate::io::Read;

#[cfg(any(target_os = "linux", target_os = "android"))]
fn getrandom(buf: &mut [u8]) -> libc::c_long {
unsafe {
libc::syscall(libc::SYS_getrandom, buf.as_mut_ptr(), buf.len(), libc::GRND_NONBLOCK)
fn getrandom(buf: &mut [u8]) -> libc::ssize_t {
// A weak symbol allows interposition, e.g. for perf measurements that want to
// disable randomness for consistency. Otherwise, we'll try a raw syscall.
// (`getrandom` was added in glibc 2.25, musl 1.1.20, android API level 28)
weak_syscall! {
fn getrandom(
buffer: *mut libc::c_void,
length: libc::size_t,
flags: libc::c_uint
) -> libc::ssize_t
}

unsafe { getrandom(buf.as_mut_ptr().cast(), buf.len(), libc::GRND_NONBLOCK) }
}

#[cfg(not(any(target_os = "linux", target_os = "android")))]
Expand Down
21 changes: 19 additions & 2 deletions library/std/src/sys/unix/weak.rs
Expand Up @@ -66,7 +66,7 @@ unsafe fn fetch(name: &str) -> usize {
libc::dlsym(libc::RTLD_DEFAULT, name.as_ptr()) as usize
}

#[cfg(not(target_os = "linux"))]
#[cfg(not(any(target_os = "linux", target_os = "android")))]
macro_rules! syscall {
(fn $name:ident($($arg_name:ident: $t:ty),*) -> $ret:ty) => (
unsafe fn $name($($arg_name: $t),*) -> $ret {
Expand All @@ -84,7 +84,7 @@ macro_rules! syscall {
)
}

#[cfg(target_os = "linux")]
#[cfg(any(target_os = "linux", target_os = "android"))]
macro_rules! syscall {
(fn $name:ident($($arg_name:ident: $t:ty),*) -> $ret:ty) => (
unsafe fn $name($($arg_name:$t),*) -> $ret {
Expand All @@ -99,3 +99,20 @@ macro_rules! syscall {
}
)
}

/// Use a weak symbol from libc when possible, allowing `LD_PRELOAD` interposition,
/// but if it's not found just use a raw syscall.
#[cfg(any(target_os = "linux", target_os = "android"))]
macro_rules! weak_syscall {
(fn $name:ident($($arg_name:ident: $t:ty),*) -> $ret:ty) => (
unsafe fn $name($($arg_name:$t),*) -> $ret {
weak! { fn $name($($t),*) -> $ret }
if let Some(fun) = $name.get() {
fun($($arg_name),*)
} else {
syscall! { fn $name($($arg_name:$t),*) -> $ret }
$name($($arg_name),*)
}
}
)
}

0 comments on commit 7a15f02

Please sign in to comment.