From af0cdcc72c56ae32546f1a55a6d8aa907b61c5de Mon Sep 17 00:00:00 2001 From: Wang Xingxing Date: Thu, 19 Oct 2023 20:00:57 +0800 Subject: [PATCH] btf: support both elf and raw BTF in loadKernelSpec Signed-off-by: Wang Xingxing --- btf/btf.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/btf/btf.go b/btf/btf.go index a2ee2d130..9291b8c14 100644 --- a/btf/btf.go +++ b/btf/btf.go @@ -322,12 +322,12 @@ func loadKernelSpec() (_ *Spec, fallback bool, _ error) { } defer file.Close() - spec, err := loadSpecFromELF(file) + spec, err := LoadSpecFromReader(file) return spec, true, err } // findVMLinux scans multiple well-known paths for vmlinux kernel images. -func findVMLinux() (*internal.SafeELFFile, error) { +func findVMLinux() (*os.File, error) { release, err := internal.KernelRelease() if err != nil { return nil, err @@ -346,7 +346,7 @@ func findVMLinux() (*internal.SafeELFFile, error) { } for _, loc := range locations { - file, err := internal.OpenSafeELFFile(fmt.Sprintf(loc, release)) + file, err := os.Open(fmt.Sprintf(loc, release)) if errors.Is(err, os.ErrNotExist) { continue }