From 7c00199640a237be161a650882ce496792bfb373 Mon Sep 17 00:00:00 2001 From: imkiva Date: Sun, 7 Apr 2024 14:45:26 +0800 Subject: [PATCH] fix: kernel version parsing failed too early. libbpf does not fail that early when `get_{OS}_kernel_version()` failed to scan kernel version strings from either `/proc/version_signature` or from `utsname::version` https://github.com/libbpf/libbpf/blob/855bf91055a6250642dff1390231387cc5540711/src/libbpf_probes.c#L80 --- aya/src/util.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aya/src/util.rs b/aya/src/util.rs index f3b68017..93df51fb 100644 --- a/aya/src/util.rs +++ b/aya/src/util.rs @@ -130,7 +130,7 @@ impl KernelVersion { } fn get_kernel_version() -> Result { - if let Some(v) = Self::get_ubuntu_kernel_version()? { + if let Ok(Some(v)) = Self::get_ubuntu_kernel_version() { return Ok(v); } @@ -139,7 +139,7 @@ impl KernelVersion { return Err(io::Error::last_os_error().into()); } - if let Some(v) = Self::get_debian_kernel_version(&info)? { + if let Ok(Some(v)) = Self::get_debian_kernel_version(&info) { return Ok(v); }