External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-22 03:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

net_util: Change libc::getrandom to getrandom::getrandom

Browse Source 
libc::getrandom need to be called inside unsafe and it is not
cross-platform friendly.
Change it to getrandom::getrandom that is safe and cross-platform
friendly.

Signed-off-by: Hui Zhu <teawater@antfin.com>
This commit is contained in:
Hui Zhu 2021-09-15 21:50:03 +08:00 committed by Sebastien Boeuf
parent c741c01cc0
commit c313bcbfd4
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -600,6 +600,7 @@ name = "net_util"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"epoll", "epoll",
"getrandom",
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",

1
net_util/Cargo.toml
View File

@ -6,6 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
epoll = "4.3.1" epoll = "4.3.1"
getrandom = "0.2"
libc = "0.2.102" libc = "0.2.102"
log = "0.4.14" log = "0.4.14"
net_gen = { path = "../net_gen" } net_gen = { path = "../net_gen" }

21
net_util/src/mac.rs
View File

@ -82,21 +82,12 @@ impl MacAddr {
pub fn local_random() -> MacAddr { pub fn local_random() -> MacAddr {
// Generate a fully random MAC // Generate a fully random MAC
let mut random_bytes = [0u8; MAC_ADDR_LEN]; let mut random_bytes = [0u8; MAC_ADDR_LEN];
unsafe { if let Err(e) = getrandom::getrandom(&mut random_bytes) {
// Man page says this function will not be interrupted by a signal error!(
// for requests less than 256 bytes "Error populating MAC address with random data: {}",
if libc::getrandom( e.to_string()
random_bytes.as_mut_ptr() as *mut _ as *mut libc::c_void, );
MAC_ADDR_LEN, }
0,
) < 0
{
error!(
"Error populating MAC address with random data: {}",
std::io::Error::last_os_error()
)
}
};
// Set the first byte to make the OUI a locally administered OUI // Set the first byte to make the OUI a locally administered OUI
random_bytes[0] = 0x2e; random_bytes[0] = 0x2e;