more cleanup

README.md

@@ -18,7 +18,7 @@ __binsec__ is a minimal static analysis utility for detecting security mitigatio
 * Supports ELF, PE and Mach-Os
 * Backends [libgoblin](/~https://github.com/m4b/goblin) for binary parsing
 * JSON serialization
-* Small release builds at ~2.44Mb, with analysis done in 30ms.
+* Small release builds at ~2.2Mb, with analysis done in 30ms.
 
 The project currently supports static detection for a variety of executable checks:
 

src/check/elf.rs

@@ -129,7 +129,7 @@ impl ElfCompilationProperties for Elf<'_> {
         self.interpreter
     }
 
-    // TODO(alan): match on other stdlib runtimes
+    // TODO(alan): match on other stdlib runtimes, right now only glibc support
     fn libc(&self) -> f64 {
         let mut glibcs: Vec<f64> = vec![];
         for sym in self.dynstrtab.to_vec().unwrap() {
@@ -142,7 +142,7 @@ impl ElfCompilationProperties for Elf<'_> {
         if !glibcs.is_empty() {
             glibcs.iter().fold(f64::INFINITY, |a, &b| a.min(b))
         } else {
-            0.0
+            f64::INFINITY
         }
     }
 }
@@ -228,7 +228,7 @@ impl Analyze for Elf<'_> {
             comp_map.insert("Linker Path".to_string(), json!(linker));
         }
 
-        if self.libc() != 0.0 {
+        if self.libc() != f64::INFINITY {
             comp_map.insert(
                 "Minimum Libc Version".to_string(),
                 json!(format!("2.{:?}", self.libc())),

src/check/mach.rs

@@ -95,10 +95,10 @@ impl Analyze for MachO<'_> {
     fn mitigations(&self) -> GenericMap {
         let mut mitigate_map: GenericMap = GenericMap::new();
         mitigate_map.insert(
-            "Executable Stack".to_string(),
+            "Non-executable Stack".to_string(),
             json!(self.executable_stack()),
         );
-        mitigate_map.insert("Executable Heap".to_string(), json!(self.executable_heap()));
+        mitigate_map.insert("Non-executable Heap".to_string(), json!(self.executable_heap()));
         mitigate_map.insert(
             "Position Independent Executable / ASLR".to_string(),
             json!(self.position_independent()),
@@ -108,6 +108,11 @@ impl Analyze for MachO<'_> {
             "__RESTRICT segment".to_string(),
             json!(self.restricted_segment()),
         );
+        mitigate_map.insert(
+            "__PAGEZERO segment".to_string(),
+            json!(self.pagezero_segment()),
+        );
+
         mitigate_map
     }
 

src/check/pe.rs

@@ -137,6 +137,7 @@ impl Analyze for PE<'_> {
         mitigation_checks
     }
 
+    // TODO
     fn instrumentation(&self) -> GenericMap {
         GenericMap::new()
     }