Changeset 4009Tweet

Timestamp:

Nov 23, 2009, 1:26:53 AM (11 years ago)

Author:

Sam Hocevar

Message:

Add a second level of debugging for slightly less useful information.

Location:

zzuf/trunk

Files:

• doc/libzzuf.3 (modified) (2 diffs)
• doc/zzuf.1 (modified) (2 diffs)
• src/debug.c (modified) (6 diffs)
• src/debug.h (modified) (2 diffs)
• src/fd.c (modified) (2 diffs)
• src/fuzz.c (modified) (2 diffs)
• src/libzzuf.c (modified) (5 diffs)
• src/libzzuf.h (modified) (2 diffs)
• src/zzuf.c (modified) (3 diffs)

zzuf/trunk/doc/libzzuf.3

@@ -1 @@
-.TH libzzuf 3 "2008-06-10" "libzzuf"
+.TH libzzuf 3 "2009-11-22" "libzzuf"
 .SH NAME
 libzzuf \- helper library for the zzuf multiple purpose fuzzer
@@ -21 +21 @@
 .TP
 \fBZZUF_DEBUG\fR
+This environment variable is set to the debugging level. 0 means no debugging
+information is sent to \fBzzuf\fR. 1 logs important information as well as
+all diverted functions. 2 logs fuzzing status and all optional file stream
+information.
+.TP
+\fBZZUF_DEBUGFD\fR
 This environment variable is set to a file descriptor where \fBlibzzuf\fR will
 send debugging information. This is used to send data to the main \fBzzuf\fR

zzuf/trunk/doc/zzuf.1

@@ -1 @@
-.TH zzuf 1 "2006-12-22" "zzuf"
+.TH zzuf 1 "2009-11-22" "zzuf"
 .SH NAME
 zzuf \- multiple purpose fuzzer
@@ -93 +93 @@
 .TP
 \fB\-d\fR, \fB\-\-debug\fR
-Activate the display of debug messages.
+Activate the display of debug messages. Can be specified multiple times for
+increased verbosity.
 .TP
 \fB\-D\fR, \fB\-\-delay\fR=\fIdelay\fR

zzuf/trunk/src/debug.c

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -37 +37 @@
 #include "libzzuf.h"
 
-extern int _zz_debugfd;
+static void mydebug(char const *format, va_list args);
 
 /**
@@ -57 +57 @@
     } while(0)
 
+void _zz_debug(char const *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    if (_zz_debuglevel >= 1)
+        mydebug(format, args);
+    va_end(args);
+}
+
+void _zz_debug2(char const *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    if (_zz_debuglevel >= 2)
+        mydebug(format, args);
+    va_end(args);
+}
+
 /**
  * Format a string, printf-like, and write the resulting data to zzuf's
@@ -68 +86 @@
  *  - fprintf(stderr, "\n");
  */
-void _zz_debug(char const *format, ...)
+static void mydebug(char const *format, va_list args)
 {
     static char const *hex2char = "0123456789abcdef";
     char const *f;
-    va_list args;
     int saved_errno;
 
@@ -79 +96 @@
 
     saved_errno = errno;
-    va_start(args, format);
 
     write(_zz_debugfd, "** zzuf debug ** ", 17);
@@ -187 +203 @@
     }
     write(_zz_debugfd, "\n", 1);
-    va_end(args);
     errno = saved_errno;
 }

zzuf/trunk/src/debug.h

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -18 +18 @@
 
 extern void _zz_debug(const char *format, ...) ATTRIBUTE_PRINTF(1,2);
+extern void _zz_debug2(const char *format, ...) ATTRIBUTE_PRINTF(1,2);
 
 #ifdef LIBZZUF
 #   define debug _zz_debug
+#   define debug2 _zz_debug2
 #else
-#   define debug(...)
+#   define debug(...) do {} while(0)
+#   define debug2(...) do {} while(0)
 #endif
 

zzuf/trunk/src/fd.c

@@ -224 +224 @@
         return;
 
-#if 0
     if(autoinc)
-        debug("using seed %li", (long int)seed);
-#endif
+        debug2("using seed %li", (long int)seed);
 
     /* If filedescriptor is outside our bounds */
@@ -378 +376 @@
         return;
 
+    debug2("setfuzzed(%i, %i)", fd, count);
+
     files[fds[fd]].already_pos = files[fds[fd]].pos;
     files[fds[fd]].already_fuzzed = count;

zzuf/trunk/src/fuzz.c

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006-2007 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -92 +92 @@
     int todo;
 
-    debug("fuzz(%i, @%lli, %lli)", fd, (long long int)pos, (long long int)len);
+    debug2("fuzz(%i, @%lli, %lli)", fd, (long long int)pos, (long long int)len);
 
     aligned_buf = buf - pos;

zzuf/trunk/src/libzzuf.c

@@ -65 +65 @@
  * Is libzzuf fully initialised?
  */
-int   _zz_ready    = 0;
+int _zz_ready = 0;
+
+/**
+ * The debugging level that libzzuf should use. 0 means no debugging,
+ * 1 means minimal debugging, 2 means verbose debugging. Its value is set
+ * by the ZZUF_DEBUG environment variable.
+ */
+int _zz_debuglevel = 0;
 
 /**
  * The file descriptor used by libzzuf for communication with the main
- * zzuf program in debug mode. Its value is set by the ZZUF_DEBUG
+ * zzuf program in debug mode. Its value is set by the ZZUF_DEBUGFD
  * environment variable.
  */
-int   _zz_debugfd  = -1;
+int _zz_debugfd = -1;
 
 /**
@@ -80 +87 @@
  * instance. Its value is set by the ZZUF_SIGNAL environment variable.
  */
-int   _zz_signal   = 0;
+int _zz_signal = 0;
 
 /**
@@ -88 +95 @@
  * variable.
  */
-int   _zz_memory   = 0;
+int _zz_memory = 0;
 
 /**
@@ -95 +102 @@
  * variable.
  */
-int   _zz_network  = 0;
+int _zz_network = 0;
 
 /**
@@ -111 +118 @@
 
     tmp = getenv("ZZUF_DEBUG");
+    if(tmp)
+        _zz_debuglevel = atoi(tmp);
+
+    tmp = getenv("ZZUF_DEBUGFD");
     if(tmp)
         _zz_debugfd = atoi(tmp);

zzuf/trunk/src/libzzuf.h

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -51 +51 @@
 extern int _zz_ready;
 extern int _zz_disabled;
+extern int _zz_debuglevel;
 extern int _zz_debugfd;
 extern int _zz_signal;

zzuf/trunk/src/zzuf.c

@@ -158 +158 @@
     int cmdline = 0;
 #endif
-    int network = 0;
+    int debug = 0, network = 0;
     int i;
 
@@ -260 +260 @@
             break;
         case 'd': /* --debug */
-            setenv("ZZUF_DEBUG", DEBUG_FILENO_STR, 1);
+            debug++;
             break;
         case 'D': /* --delay */
@@ -467 +467 @@
         setenv("ZZUF_EXCLUDE", exclude, 1);
 #endif
+
+    setenv("ZZUF_DEBUG", debug ? debug > 1 ? "2" : "1" : "0", 1);
+    setenv("ZZUF_DEBUGFD", DEBUG_FILENO_STR, 1);
 
     if(opts->fuzzing)