kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

net_util: remove MAX_INTERFACE_NAME_LEN

Browse Source 
`MAX_INTERFACE_NAME_LEN` is equivalent to `libc::IFNAMSIZ`, so we use
that instead of maintaining our own const.

On-behalf-of: SAP julian.schindel@sap.com
Signed-off-by: Julian Schindel <julian.schindel@cyberus-technology.de>
This commit is contained in:
Julian Schindel
2026-05-19 13:38:41 +02:00
committed by Bo Chen
parent 3837c87f1f
commit 0ee3349889
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
net_util/src/tap.rs
View File

@@ -12,7 +12,7 @@ use std::net::{IpAddr, Ipv6Addr};
use std::os::raw::*; use std::os::raw::*;
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
use libc::{__c_anonymous_ifr_ifru, ifreq}; use libc::{__c_anonymous_ifr_ifru, IFNAMSIZ, ifreq};
use thiserror::Error; use thiserror::Error;
use vmm_sys_util::ioctl::{ioctl_with_mut_ref, ioctl_with_ref, ioctl_with_val}; use vmm_sys_util::ioctl::{ioctl_with_mut_ref, ioctl_with_ref, ioctl_with_val};
@@ -22,13 +22,6 @@ use super::{
}; };
use crate::mac::MAC_ADDR_LEN; use crate::mac::MAC_ADDR_LEN;
/// Maximum length of a network interface name in Linux, excluding any NUL byte.
///
/// This corresponds to `IFNAMSIZ` in Linux [[0]].
///
/// [0]: https://elixir.bootlin.com/linux/v6.12/source/include/uapi/linux/if.h#L33
const MAX_INTERFACE_NAME_LEN: usize = 15;
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum Error { pub enum Error {
#[error("Couldn't open /dev/net/tun")] #[error("Couldn't open /dev/net/tun")]
@@ -43,7 +36,7 @@ pub enum Error {
IoctlError(c_ulong, #[source] IoError), IoctlError(c_ulong, #[source] IoError),
#[error("Failed to create a socket")] #[error("Failed to create a socket")]
NetUtil(#[source] NetUtilError), NetUtil(#[source] NetUtilError),
#[error("Interface name too long (max length is {MAX_INTERFACE_NAME_LEN}): {0}")] #[error("Interface name too long (max length is {max_len}): {0}", max_len = IFNAMSIZ - 1)]
IfnameTooLong(String), IfnameTooLong(String),
#[error("Interface name contains interior NUL byte: {0:?}")] #[error("Interface name contains interior NUL byte: {0:?}")]
IfnameContainsNUL(String), IfnameContainsNUL(String),
@@ -66,7 +59,7 @@ pub type Result<T> = ::std::result::Result<T, Error>;
#[derive(Debug)] #[derive(Debug)]
pub struct Tap { pub struct Tap {
tap_file: File, tap_file: File,
/// The name does not exceed [`MAX_INTERFACE_NAME_LEN`] bytes excluding the NUL byte. /// The name does not exceed [`IFNAMSIZ`] bytes including the NUL byte.
if_name: CString, if_name: CString,
} }
@@ -157,7 +150,7 @@ impl Tap {
} }
pub fn open_named(if_name: &str, num_queue_pairs: usize, flags: Option<i32>) -> Result<Tap> { pub fn open_named(if_name: &str, num_queue_pairs: usize, flags: Option<i32>) -> Result<Tap> {
if if_name.len() > MAX_INTERFACE_NAME_LEN { if if_name.len() > IFNAMSIZ - 1 {
return Err(Error::IfnameTooLong(if_name.to_string())); return Err(Error::IfnameTooLong(if_name.to_string()));
} }
@@ -202,7 +195,7 @@ impl Tap {
} }
let mut ifreq = libc::ifreq { let mut ifreq = libc::ifreq {
ifr_name: [0; libc::IFNAMSIZ], ifr_name: [0; IFNAMSIZ],
ifr_ifru: __c_anonymous_ifr_ifru { ifru_flags }, ifr_ifru: __c_anonymous_ifr_ifru { ifru_flags },
}; };
@@ -254,7 +247,7 @@ impl Tap {
// SAFETY: fd is a tap fd // SAFETY: fd is a tap fd
let tap_file = unsafe { File::from_raw_fd(fd) }; let tap_file = unsafe { File::from_raw_fd(fd) };
let mut ifreq: libc::ifreq = ifreq { let mut ifreq: libc::ifreq = ifreq {
ifr_name: [0; libc::IFNAMSIZ], ifr_name: [0; IFNAMSIZ],
ifr_ifru: __c_anonymous_ifr_ifru { ifru_flags: 0 }, ifr_ifru: __c_anonymous_ifr_ifru { ifru_flags: 0 },
}; };
@@ -491,7 +484,7 @@ impl Tap {
fn get_ifreq(&self) -> libc::ifreq { fn get_ifreq(&self) -> libc::ifreq {
let mut ifreq: libc::ifreq = libc::ifreq { let mut ifreq: libc::ifreq = libc::ifreq {
ifr_name: [0; libc::IFNAMSIZ], ifr_name: [0; IFNAMSIZ],
ifr_ifru: __c_anonymous_ifr_ifru { ifru_flags: 0 }, ifr_ifru: __c_anonymous_ifr_ifru { ifru_flags: 0 },
}; };
@@ -525,8 +518,8 @@ impl Tap {
#[cfg(fuzzing)] #[cfg(fuzzing)]
pub fn new_for_fuzzing(tap_file: File, if_name: &str) -> Self { pub fn new_for_fuzzing(tap_file: File, if_name: &str) -> Self {
if if_name.len() > MAX_INTERFACE_NAME_LEN { if if_name.len() > IFNAMSIZ - 1 {
panic!("provided name longer than `MAX_INTERFACE_NAME_LEN`") panic!("provided name longer than `IFNAMSIZ` without NULL terminator")
} }
let if_name = CString::new(if_name) let if_name = CString::new(if_name)