Merge branch 'master' into master

rust-fuzz · Nov 9, 2023 · 56e91d6 · 56e91d6
2 parents 031009f + 8130881
commit 56e91d6
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-afl/AFLplusplus b/cargo-afl/AFLplusplus
diff --git a/cargo-afl/src/bin/cargo-afl.rs b/cargo-afl/src/bin/cargo-afl.rs
@@ -386,6 +386,7 @@ mod tests {
     use super::*;
     use assert_cmd::Command;
     use std::os::unix::ffi::OsStringExt;
+    use std::process::Output;
 
     #[test]
     fn test_app() {
@@ -394,26 +395,34 @@ mod tests {
 
     #[test]
     fn display_name() {
-        assert!(
-            String::from_utf8(cargo_afl(&["-V"]).output().unwrap().stdout)
-                .unwrap()
-                .starts_with("cargo-afl")
-        );
+        let output = cargo_afl(&["-V"]).output().unwrap();
+        assert_success(&output, None);
+        assert!(String::from_utf8(output.stdout)
+            .unwrap()
+            .starts_with("cargo-afl"));
     }
 
     #[test]
     fn afl_required_else_help() {
+        let lhs = command().arg("--help").output().unwrap();
+        let rhs = command().output().unwrap();
+        assert_success(&lhs, None);
+        assert_failure(&rhs, None);
         assert_eq!(
-            String::from_utf8(command().arg("--help").output().unwrap().stdout).unwrap(),
-            String::from_utf8(command().output().unwrap().stderr).unwrap()
+            String::from_utf8(lhs.stdout).unwrap(),
+            String::from_utf8(rhs.stderr).unwrap()
         );
     }
 
     #[test]
     fn subcommand_required_else_help() {
+        let lhs = cargo_afl(&["--help"]).output().unwrap();
+        let rhs = cargo_afl::<&OsStr>(&[]).output().unwrap();
+        assert_success(&lhs, None);
+        assert_failure(&rhs, None);
         assert_eq!(
-            String::from_utf8(cargo_afl(&["--help"]).output().unwrap().stdout).unwrap(),
-            String::from_utf8(cargo_afl::<&OsStr>(&[]).output().unwrap().stderr).unwrap()
+            String::from_utf8(lhs.stdout).unwrap(),
+            String::from_utf8(rhs.stderr).unwrap()
         );
     }
 
@@ -467,52 +476,57 @@ mod tests {
 
     #[test]
     fn subcommands_help_subcommand_disabled() {
-        assert!(
-            String::from_utf8(cargo_afl(&["help"]).output().unwrap().stdout)
-                .unwrap()
-                .starts_with("Usage:")
-        );
+        let output = cargo_afl(&["help"]).output().unwrap();
+        assert_success(&output, None);
+        assert!(String::from_utf8(output.stdout)
+            .unwrap()
+            .starts_with("Usage:"));
 
         for &subcommand in SUBCOMMANDS {
-            assert!(
-                !String::from_utf8(cargo_afl(&[subcommand, "help"]).output().unwrap().stdout)
-                    .unwrap()
-                    .starts_with("Usage:")
-            );
+            let output = cargo_afl(&[subcommand, "help"]).output().unwrap();
+            assert_failure(&output, Some(subcommand));
+            assert!(!String::from_utf8(output.stdout)
+                .unwrap()
+                .starts_with("Usage:"));
         }
     }
 
     #[test]
     fn subcommands_help_flag_disabled() {
-        assert!(
-            String::from_utf8(cargo_afl(&["--help"]).output().unwrap().stdout)
-                .unwrap()
-                .starts_with("Usage:")
-        );
-
-        for &subcommand in SUBCOMMANDS {
-            assert!(!String::from_utf8(
-                cargo_afl(&[subcommand, "--help"]).output().unwrap().stdout
-            )
+        let output = cargo_afl(&["--help"]).output().unwrap();
+        assert_success(&output, None);
+        assert!(String::from_utf8(output.stdout)
             .unwrap()
             .starts_with("Usage:"));
+
+        for &subcommand in SUBCOMMANDS {
+            let output = cargo_afl(&[subcommand, "--help"]).output().unwrap();
+            // smoelius: `afl-system-config` has a `--help` flag.
+            if subcommand == "system-config" {
+                assert_success(&output, Some(subcommand));
+            } else {
+                assert_failure(&output, Some(subcommand));
+            }
+            assert!(!String::from_utf8(output.stdout)
+                .unwrap()
+                .starts_with("Usage:"));
         }
     }
 
     #[test]
     fn subcommands_version_flag_disabled() {
-        assert!(
-            String::from_utf8(cargo_afl(&["-V"]).output().unwrap().stdout)
-                .unwrap()
-                .starts_with("cargo-afl")
-        );
+        let output = cargo_afl(&["-V"]).output().unwrap();
+        assert_success(&output, None);
+        assert!(String::from_utf8(output.stdout)
+            .unwrap()
+            .starts_with("cargo-afl"));
 
         for &subcommand in SUBCOMMANDS {
-            assert!(
-                !String::from_utf8(cargo_afl(&[subcommand, "-V"]).output().unwrap().stdout)
-                    .unwrap()
-                    .starts_with("cargo-afl")
-            );
+            let output = cargo_afl(&[subcommand, "-V"]).output().unwrap();
+            assert_failure(&output, Some(subcommand));
+            assert!(!String::from_utf8(output.stdout)
+                .unwrap()
+                .starts_with("cargo-afl"));
         }
     }
 
@@ -526,6 +540,30 @@ mod tests {
         Command::cargo_bin("cargo-afl").unwrap()
     }
 
+    fn assert_success(output: &Output, subcommand: Option<&str>) {
+        assert!(
+            output.status.success(),
+            "{}",
+            if let Some(subcommand) = subcommand {
+                format!("{subcommand} failed")
+            } else {
+                String::new()
+            }
+        );
+    }
+
+    fn assert_failure(output: &Output, subcommand: Option<&str>) {
+        assert!(
+            !output.status.success(),
+            "{}",
+            if let Some(subcommand) = subcommand {
+                format!("{subcommand} succeeded")
+            } else {
+                String::new()
+            }
+        );
+    }
+
     fn invalid_utf8() -> OsString {
         OsString::from_vec(vec![0xfe])
     }
+1 −0		.gitignore
+6 −1		GNUmakefile
+1 −1		GNUmakefile.llvm
+10 −4		TODO.md
+54 −0		afl-addseeds
+9 −4		afl-persistent-config
+5 −1		afl-system-config
+188 −169		afl-whatsup
+8 −0		docs/Changelog.md
+1 −0		docs/INSTALL.md
+6 −0		docs/env_variables.md
+24 −16		docs/fuzzing_in_depth.md
+8 −0		frida_mode/src/instrument/instrument_arm64.c
+4 −2		frida_mode/src/lib/lib.c
+1 −1		frida_mode/test/png/GNUmakefile
+2 −1		frida_mode/util/frida_get_symbol_addr.sh
+2 −1		include/afl-fuzz.h
+2 −2		include/config.h
+38 −17		include/debug.h
+2 −0		include/envs.h
+1 −0		include/forkserver.h
+4 −0		instrumentation/SanitizerCoveragePCGUARD.so.cc
+17 −12		instrumentation/afl-compiler-rt.o.c
+12 −1		instrumentation/afl-llvm-dict2file.so.cc
+2 −2		instrumentation/afl-llvm-pass.so.cc
+20 −4		instrumentation/compare-transform-pass.so.cc
+1 −1		nyx_mode/QEMU-Nyx
+22 −14		src/afl-cc.c
+10 −3		src/afl-forkserver.c
+2 −1		src/afl-fuzz-bitmap.c
+5 −0		src/afl-fuzz-init.c
+13 −2		src/afl-fuzz-one.c
+20 −2		src/afl-fuzz-queue.c
+231 −24		src/afl-fuzz-redqueen.c
+34 −13		src/afl-fuzz-stats.c
+1 −1		src/afl-fuzz-statsd.c
+83 −16		src/afl-fuzz.c
+0 −21		src/afl-performance.c
+1 −1		unicorn_mode/UNICORNAFL_VERSION
+13 −13		unicorn_mode/helper_scripts/unicorn_dumper_pwndbg.py
+1 −1		unicorn_mode/unicornafl
+6 −1		utils/afl_untracer/Makefile
+33 −1		utils/afl_untracer/afl-untracer.c
+1 −1		utils/qbdi_mode/build.sh