fixup! ELF relocations

Author: d-e-s-o

src/elf/parser.rs

@@ -1066,7 +1066,7 @@ where
                         .context("failed to read ELF RELA entries")?;
 
                     for rela in entries.iter() {
-                        let r_type = rela.r_info & 0xff;
+                        let (r_type, sym_idx) = rela.dissect_info();
                         if r_type == 0 {
                             continue;
                         }
@@ -1077,7 +1077,6 @@ where
                                 ehdr.ehdr.machine()
                             );
                         }
-                        let sym_idx = (rela.r_info >> 8) as usize;
                         let sym_value = if sym_idx > 0 {
                             let sym = syms
                                 .get(sym_idx)
@@ -1106,7 +1105,7 @@ where
                         .context("failed to read ELF REL entries")?;
 
                     for rel in entries.iter() {
-                        let r_type = rel.r_info & 0xff;
+                        let (r_type, sym_idx) = rel.dissect_info();
                         if r_type == 0 {
                             continue;
                         }
@@ -1117,7 +1116,6 @@ where
                                 ehdr.ehdr.machine()
                             );
                         }
-                        let sym_idx = (rel.r_info >> 8) as usize;
                         let sym_value = if sym_idx > 0 {
                             let sym = syms
                                 .get(sym_idx)
@@ -1154,7 +1152,7 @@ where
                         .context("failed to read ELF RELA entries")?;
 
                     for rela in entries.iter() {
-                        let r_type = (rela.r_info & 0xffffffff) as u32;
+                        let (r_type, sym_idx) = rela.dissect_info();
                         if r_type == 0 {
                             continue;
                         }
@@ -1165,7 +1163,6 @@ where
                                 ehdr.ehdr.machine()
                             );
                         }
-                        let sym_idx = (rela.r_info >> 32) as usize;
                         let sym_value = if sym_idx > 0 {
                             let sym = syms
                                 .get(sym_idx)
@@ -1194,7 +1191,7 @@ where
                         .context("failed to read ELF REL entries")?;
 
                     for rel in entries.iter() {
-                        let r_type = (rel.r_info & 0xffffffff) as u32;
+                        let (r_type, sym_idx) = rel.dissect_info();
                         if r_type == 0 {
                             continue;
                         }
@@ -1205,7 +1202,6 @@ where
                                 ehdr.ehdr.machine()
                             );
                         }
-                        let sym_idx = (rel.r_info >> 32) as usize;
                         let sym_value = if sym_idx > 0 {
                             let sym = syms
                                 .get(sym_idx)

src/elf/types.rs

@@ -739,6 +739,14 @@ pub(crate) struct Elf32_Rel {
     pub r_info: Elf32_Word,
 }
 
+impl Elf32_Rel {
+    pub fn dissect_info(&self) -> (u32, usize) {
+        let r_type = self.r_info & 0xff;
+        let sym_idx = (self.r_info >> 8) as usize;
+        (r_type, sym_idx)
+    }
+}
+
 // SAFETY: `Elf32_Rel` is valid for any bit pattern.
 unsafe impl Pod for Elf32_Rel {}
 
@@ -750,6 +758,14 @@ pub(crate) struct Elf64_Rel {
     pub r_info: Elf64_Xword,
 }
 
+impl Elf64_Rel {
+    pub fn dissect_info(&self) -> (u32, usize) {
+        let r_type = (self.r_info & 0xffffffff) as u32;
+        let sym_idx = (self.r_info >> 32) as usize;
+        (r_type, sym_idx)
+    }
+}
+
 // SAFETY: `Elf64_Rel` is valid for any bit pattern.
 unsafe impl Pod for Elf64_Rel {}
 
@@ -766,6 +782,14 @@ pub(crate) struct Elf32_Rela {
     pub r_addend: i32,
 }
 
+impl Elf32_Rela {
+    pub fn dissect_info(&self) -> (u32, usize) {
+        let r_type = self.r_info & 0xff;
+        let sym_idx = (self.r_info >> 8) as usize;
+        (r_type, sym_idx)
+    }
+}
+
 // SAFETY: `Elf32_Rela` is valid for any bit pattern.
 unsafe impl Pod for Elf32_Rela {}
 
@@ -778,6 +802,14 @@ pub(crate) struct Elf64_Rela {
     pub r_addend: i64,
 }
 
+impl Elf64_Rela {
+    pub fn dissect_info(&self) -> (u32, usize) {
+        let r_type = (self.r_info & 0xffffffff) as u32;
+        let sym_idx = (self.r_info >> 32) as usize;
+        (r_type, sym_idx)
+    }
+}
+
 // SAFETY: `Elf64_Rela` is valid for any bit pattern.
 unsafe impl Pod for Elf64_Rela {}