From 4efc2061a8aa0c25cb648a86cdc39ca44784de94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alessandro=C2=A0Decina?= <alessandro.d@gmail.com>
Date: Mon, 17 Jan 2022 20:03:31 +0000
Subject: [PATCH] btf: fix borrow check errors

---
 aya/src/obj/btf/btf.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/aya/src/obj/btf/btf.rs b/aya/src/obj/btf/btf.rs
index 12c930dd..3e1e0f7a 100644
--- a/aya/src/obj/btf/btf.rs
+++ b/aya/src/obj/btf/btf.rs
@@ -454,7 +454,7 @@ impl Btf {
                 }
                 // Fixup DATASEC
                 BtfKind::DataSec if features.btf_datasec => {
-                    if let Some(BtfType::DataSec(ty, data)) = types.types.get_mut(i) {
+                    if let Some(BtfType::DataSec(ty, data)) = types.types.get(i) {
                         // Start DataSec Fixups
                         let sec_name = self.string_at(ty.name_off)?;
                         let name = sec_name.to_string();
@@ -465,22 +465,25 @@ impl Btf {
                             continue;
                         }
 
+                        let mut fixed_ty = *ty;
+                        let mut fixed_data = data.clone();
                         // We need to get the size of the section from the ELF file
                         // Fortunately, we cached these when parsing it initially
                         // and we can this up by name in section_sizes
-                        if let Some(size) = section_sizes.get(&name) {
-                            debug!("{} {}: fixup size to {}", kind, name, size);
-                            ty.__bindgen_anon_1.size = *size as u32;
-                        } else {
-                            return Err(BtfError::UnknownSectionSize { section_name: name });
-                        }
+                        let size = section_sizes.get(&name).ok_or_else(|| {
+                            BtfError::UnknownSectionSize {
+                                section_name: name.clone(),
+                            }
+                        })?;
+                        debug!("{} {}: fixup size to {}", kind, name, size);
+                        fixed_ty.__bindgen_anon_1.size = *size as u32;
 
                         // The Vec<btf_var_secinfo> contains BTF_KIND_VAR sections
                         // that need to have their offsets adjusted. To do this,
                         // we need to get the offset from the ELF file.
                         // This was also cached during initial parsing and
                         // we can query by name in symbol_offsets
-                        for d in data {
+                        for d in &mut fixed_data {
                             let var_type = types.type_by_id(d.type_)?;
                             let var_kind = var_type.kind()?.unwrap();
                             if let BtfType::Var(vty, var) = var_type {
@@ -507,6 +510,7 @@ impl Btf {
                                 return Err(BtfError::InvalidDatasec);
                             }
                         }
+                        types.types[i] = BtfType::DataSec(fixed_ty, fixed_data);
                     }
                 }
                 // Fixup FUNC_PROTO