Elf gnu symbol versioning

src/elf/symver.rs

@@ -17,10 +17,10 @@
 //!         for need_file in verneed.iter() {
 //!             println!(
 //!                 "Depend on {:?} with version(s):",
-//!                 verneed.verstr.get_at(need_file.vn_file)
+//!                 binary.dynstrtab.get_at(need_file.vn_file)
 //!             );
 //!             for need_ver in need_file.iter() {
-//!                 println!("{:?}", verneed.verstr.get_at(need_ver.vna_name));
+//!                 println!("{:?}", binary.dynstrtab.get_at(need_ver.vna_name));
 //!             }
 //!         }
 //!     }
@@ -40,7 +40,7 @@
 //!     if let Some(verdef) = &binary.verdef {
 //!         for def in verdef.iter() {
 //!             for (n, aux) in def.iter().enumerate() {
-//!                 let name = verdef.verstr.get_at(aux.vda_name);
+//!                 let name = binary.dynstrtab.get_at(aux.vda_name);
 //!                 match n {
 //!                     0 => print!("Name: {:?}", name),
 //!                     1 => print!(" Parent: {:?}", name),
@@ -61,8 +61,7 @@
 
 use crate::container;
 use crate::elf::section_header::{SectionHeader, SHT_GNU_VERDEF, SHT_GNU_VERNEED, SHT_GNU_VERSYM};
-use crate::error::{Error, Result};
-use crate::strtab::Strtab;
+use crate::error::Result;
 use core::iter::FusedIterator;
 use scroll::Pread;
 
@@ -320,7 +319,6 @@ impl From<ElfVersym> for Versym {
 #[derive(Debug)]
 pub struct VerdefSection<'a> {
     /// String table used to resolve version strings.
-    pub verstr: Strtab<'a>,
     bytes: &'a [u8],
     count: usize,
     ctx: container::Ctx,
@@ -333,10 +331,9 @@ impl<'a> VerdefSection<'a> {
         ctx: container::Ctx,
     ) -> Result<Option<VerdefSection<'a>>> {
         // Get fields needed from optional `version definition` section.
-        let (link_idx, offset, size, count) =
+        let (offset, size, count) =
             if let Some(shdr) = shdrs.iter().find(|shdr| shdr.sh_type == SHT_GNU_VERDEF) {
                 (
-                    shdr.sh_link as usize, // Encodes the string table.
                     shdr.sh_offset as usize,
                     shdr.sh_size as usize,
                     shdr.sh_info as usize, // Encodes the number of ElfVerdef entries.
@@ -345,32 +342,10 @@ impl<'a> VerdefSection<'a> {
                 return Ok(None);
             };
 
-        // Get string table which is used to resolve version strings.
-        let verstr = {
-            // Linked section refers to string table.
-            let shdr_link = shdrs.get(link_idx).ok_or_else(|| {
-                Error::Malformed(
-                    "Section header of string table for SHT_GNU_VERDEF section not found!".into(),
-                )
-            })?;
-
-            Strtab::parse(
-                bytes,
-                shdr_link.sh_offset as usize,
-                shdr_link.sh_size as usize,
-                0x0, /* Delimiter */
-            )?
-        };
-
         // Get a slice of bytes of the `version definition` section content.
         let bytes: &'a [u8] = bytes.pread_with(offset, size)?;
 
-        Ok(Some(VerdefSection {
-            verstr,
-            bytes,
-            count,
-            ctx,
-        }))
+        Ok(Some(VerdefSection { bytes, count, ctx }))
     }
 
     /// Get an iterator over the [`Verdef`] entries.
@@ -597,8 +572,6 @@ pub struct Verdaux {
 /// Auxiliary][Vernaux] entries.
 #[derive(Debug)]
 pub struct VerneedSection<'a> {
-    /// String table used to resolve version strings.
-    pub verstr: Strtab<'a>,
     bytes: &'a [u8],
     count: usize,
     ctx: container::Ctx,
@@ -612,10 +585,9 @@ impl<'a> VerneedSection<'a> {
         ctx: container::Ctx,
     ) -> Result<Option<VerneedSection<'a>>> {
         // Get fields needed from optional `version needed` section.
-        let (link_idx, offset, size, count) =
+        let (offset, size, count) =
             if let Some(shdr) = shdrs.iter().find(|shdr| shdr.sh_type == SHT_GNU_VERNEED) {
                 (
-                    shdr.sh_link as usize, // Encodes the string table.
                     shdr.sh_offset as usize,
                     shdr.sh_size as usize,
                     shdr.sh_info as usize, // Encodes the number of ElfVerneed entries.
@@ -624,32 +596,10 @@ impl<'a> VerneedSection<'a> {
                 return Ok(None);
             };
 
-        // Get string table which is used to resolve version strings.
-        let verstr = {
-            // Linked section refers to string table.
-            let shdr_link = shdrs.get(link_idx).ok_or_else(|| {
-                Error::Malformed(
-                    "Section header of string table for SHT_GNU_VERNEED section not found!".into(),
-                )
-            })?;
-
-            Strtab::parse(
-                bytes,
-                shdr_link.sh_offset as usize,
-                shdr_link.sh_size as usize,
-                0x0, /* Delimiter */
-            )?
-        };
-
         // Get a slice of bytes of the `version needed` section content.
         let bytes: &'a [u8] = bytes.pread_with(offset, size)?;
 
-        Ok(Some(VerneedSection {
-            verstr,
-            bytes,
-            count,
-            ctx,
-        }))
+        Ok(Some(VerneedSection { bytes, count, ctx }))
     }
 
     /// Get an iterator over the [`Verneed`] entries.

tests/elf.rs

@@ -1,8 +1,10 @@
 use goblin::elf::section_header::SHT_GNU_HASH;
-use goblin::elf::sym::Sym;
+use goblin::elf::sym::{Sym, Symtab};
+use goblin::elf::symver::{VerdefSection, VerneedSection, VersymSection};
 use goblin::elf::Elf;
 use goblin::elf32::gnu_hash::GnuHash as GnuHash32;
 use goblin::elf64::gnu_hash::GnuHash as GnuHash64;
+use goblin::strtab::Strtab;
 
 #[repr(C)]
 #[repr(align(64))] // Align to cache lines
@@ -39,7 +41,6 @@ fn parse_text_section_size_lazy(base: &[u8]) -> Result<u64, &'static str> {
 
     use goblin::container::{Container, Ctx};
     use goblin::elf::SectionHeader;
-    use goblin::strtab::Strtab;
 
     let ctx = Ctx {
         le: scroll::Endian::Little,
@@ -258,7 +259,7 @@ fn check_symver_expectations(
         assert!(elf.verneed.is_some());
 
         let verneed = elf.verneed.as_ref().unwrap();
-        check_symver_expectations_verneed(verneed, expect_verneed);
+        check_symver_expectations_verneed(verneed, expect_verneed, &elf.dynstrtab);
     }
 
     if expect_verdef.is_empty() {
@@ -269,15 +270,15 @@ fn check_symver_expectations(
         assert!(elf.verdef.is_some());
 
         let verdef = elf.verdef.as_ref().unwrap();
-        check_symver_expectations_verdef(verdef, expect_verdef);
+        check_symver_expectations_verdef(verdef, expect_verdef, &elf.dynstrtab);
     }
 
     Ok(())
 }
 
 fn check_symver_expectations_versym(
-    versym: &goblin::elf::VersymSection<'_>,
-    dynsyms: &goblin::elf::Symtab<'_>,
+    versym: &VersymSection<'_>,
+    dynsyms: &Symtab<'_>,
     expect_versym: &Vec<u16>,
 ) {
     // VERSYM section must contain one entry per DYNSYM.
@@ -298,11 +299,12 @@ fn check_symver_expectations_versym(
 }
 
 fn check_symver_expectations_verneed(
-    verneed: &goblin::elf::VerneedSection<'_>,
+    verneed: &VerneedSection<'_>,
     expect_verneed: &SymverExpectation,
+    strtab: &Strtab<'_>,
 ) {
     // Resolve version strings.
-    let verstr = |idx| verneed.verstr.get_at(idx).unwrap();
+    let verstr = |idx| strtab.get_at(idx).unwrap();
 
     // ELF file dependencies with version requirements.
     let need_files: Vec<_> = verneed.iter().collect();
@@ -349,11 +351,12 @@ fn check_symver_expectations_verneed(
 }
 
 fn check_symver_expectations_verdef(
-    verdef: &goblin::elf::VerdefSection<'_>,
+    verdef: &VerdefSection<'_>,
     expect_verdef: &SymverExpectation,
+    strtab: &Strtab<'_>,
 ) {
     // Resolve version strings.
-    let verstr = |idx| verdef.verstr.get_at(idx).unwrap();
+    let verstr = |idx| strtab.get_at(idx).unwrap();
 
     // ELF version definitions.
     let defined_vers: Vec<_> = verdef.iter().collect();