about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xafl-persistent-config4
-rw-r--r--custom_mutators/grammar_mutator/GRAMMAR_VERSION2
m---------custom_mutators/grammar_mutator/grammar_mutator0
-rw-r--r--src/afl-fuzz-one.c3
-rw-r--r--utils/afl_network_proxy/README.md2
5 files changed, 4 insertions, 7 deletions
diff --git a/afl-persistent-config b/afl-persistent-config
index a6b05e07..5a9f5e31 100755
--- a/afl-persistent-config
+++ b/afl-persistent-config
@@ -68,10 +68,10 @@ if [[ "$PLATFORM" = "Darwin" ]] ; then
     <array>
       <string>/usr/sbin/sysctl</string>
       <string>-w</string>
-      <string>kern.sysv.shmmax=268435456</string>
+      <string>kern.sysv.shmmax=524288000</string>
       <string>kern.sysv.shmmni=128</string>
       <string>kern.sysv.shmseg=32</string>
-      <string>kern.sysv.shmall=65536</string>
+      <string>kern.sysv.shmall=131072000</string>
     </array>
     <key>KeepAlive</key>
     <false/>
diff --git a/custom_mutators/grammar_mutator/GRAMMAR_VERSION b/custom_mutators/grammar_mutator/GRAMMAR_VERSION
index 9919514f..87f607cd 100644
--- a/custom_mutators/grammar_mutator/GRAMMAR_VERSION
+++ b/custom_mutators/grammar_mutator/GRAMMAR_VERSION
@@ -1 +1 @@
-a7b6026
+eedf07d
diff --git a/custom_mutators/grammar_mutator/grammar_mutator b/custom_mutators/grammar_mutator/grammar_mutator
-Subproject a7b6026ba5e3ac31cc85942e1921a15089cf8bf
+Subproject eedf07ddb0fb1f437f5e76b77cfd4064cf6a5d6
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index a92cef7a..17749601 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -5249,7 +5249,6 @@ pacemaker_fuzzing:
         }
 
         afl->temp_puppet_find = afl->total_puppet_find;
-        u64 temp_stage_finds_puppet = 0;
         for (i = 0; i < operator_num; ++i) {
 
           if (MOpt_globals.is_pilot_mode) {
@@ -5275,7 +5274,6 @@ pacemaker_fuzzing:
 
           MOpt_globals.finds[i] = MOpt_globals.finds_v2[i];
           MOpt_globals.cycles[i] = MOpt_globals.cycles_v2[i];
-          temp_stage_finds_puppet += MOpt_globals.finds[i];
 
         }                                    /* for i = 0; i < operator_num */
 
@@ -5337,7 +5335,6 @@ pacemaker_fuzzing:
                 afl->core_operator_finds_puppet_v2[i];
             afl->core_operator_cycles_puppet[i] =
                 afl->core_operator_cycles_puppet_v2[i];
-            temp_stage_finds_puppet += afl->core_operator_finds_puppet[i];
 
           }
 
diff --git a/utils/afl_network_proxy/README.md b/utils/afl_network_proxy/README.md
index a5ac3578..05659c45 100644
--- a/utils/afl_network_proxy/README.md
+++ b/utils/afl_network_proxy/README.md
@@ -32,7 +32,7 @@ e.g.:
 afl-network-server -i 1111 -m 25M -t 1000 -- /bin/target -f @@
 ```
 
-### on the (afl-fuzz) master
+### on the (afl-fuzz) main node
 
 Just run afl-fuzz with your normal options, however the target should be
 `afl-network-client` with the IP and PORT of the `afl-network-server` and