From 437432cdd60bbe11e7021f52297e459fd14ff069 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Sun, 16 Jan 2022 10:48:51 +0000 Subject: [PATCH] aya: Truncate long program names Signed-off-by: Dave Tucker --- aya/src/programs/mod.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/aya/src/programs/mod.rs b/aya/src/programs/mod.rs index 745298b9..0a9c6fc0 100644 --- a/aya/src/programs/mod.rs +++ b/aya/src/programs/mod.rs @@ -201,13 +201,6 @@ pub enum ProgramError { /// program name name: String, }, - - /// The program is too long. - #[error("the program name `{name}` iss longer than 16 characters")] - NameTooLong { - /// program name - name: String, - }, } /// Allows the Fd of a loaded [`Program`] to be retrieved @@ -424,13 +417,12 @@ fn load_program(prog_type: bpf_prog_type, data: &mut ProgramData) -> Result<(), let mut ret; let prog_name = if let Some(name) = &data.name { - let name = name.clone(); + let mut name = name.clone(); + if name.len() > 16 { + name.truncate(16); + } let prog_name = CString::new(name.clone()) .map_err(|_| ProgramError::InvalidName { name: name.clone() })?; - - if prog_name.to_bytes().len() > 16 { - return Err(ProgramError::NameTooLong { name }); - } Some(prog_name) } else { None