subject:"D7031\: fuzz\: new fuzzer for dirs.c"

D7031: fuzz: new fuzzer for dirs.c

2019-10-09 Thread durin42 (Augie Fackler)

Closed by commit rHGbd503fdb878c: fuzz: new fuzzer for dirs.c (authored by 
durin42).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7031?vs=16987=17032

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7031/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7031

AFFECTED FILES
  contrib/fuzz/Makefile
  contrib/fuzz/dirs.cc

CHANGE DETAILS

diff --git a/contrib/fuzz/dirs.cc b/contrib/fuzz/dirs.cc
new file mode 100644
--- /dev/null
+++ b/contrib/fuzz/dirs.cc
@@ -0,0 +1,56 @@
+#include 
+#include 
+#include 
+#include 
+
+#include "pyutil.h"
+
+#include 
+
+extern "C" {
+
+static PyCodeObject *code;
+
+extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+contrib::initpy(*argv[0]);
+code = (PyCodeObject *)Py_CompileString(R"py(
+from parsers import dirs
+try:
+  files = mdata.split('\n')
+  d = dirs(files)
+  list(d)
+  'a' in d
+  if files:
+files[0] in d
+except Exception as e:
+  pass
+  # uncomment this print if you're editing this Python code
+  # to debug failures.
+  # print e
+)py",
+"fuzzer", Py_file_input);
+return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
+{
+// Don't allow fuzzer inputs larger than 100k, since we'll just bog
+// down and not accomplish much.
+if (Size > 10) {
+return 0;
+}
+PyObject *mtext =
+PyBytes_FromStringAndSize((const char *)Data, (Py_ssize_t)Size);
+PyObject *locals = PyDict_New();
+PyDict_SetItemString(locals, "mdata", mtext);
+PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);
+if (!res) {
+PyErr_Print();
+}
+Py_XDECREF(res);
+Py_DECREF(locals);
+Py_DECREF(mtext);
+return 0; // Non-zero return values are reserved for future use.
+}
+}
diff --git a/contrib/fuzz/Makefile b/contrib/fuzz/Makefile
--- a/contrib/fuzz/Makefile
+++ b/contrib/fuzz/Makefile
@@ -105,6 +105,17 @@
  -I../../mercurial \
  -c -o revlog.o ../../mercurial/cext/revlog.c
 
+dirs_fuzzer: dirs.cc manifest.o charencode.o parsers.o dirs.o pathencode.o 
revlog.o pyutil.o
+   $(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
+ -Wno-register -Wno-macro-redefined \
+ -I../../mercurial dirs.cc \
+ manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o 
pyutil.o \
+ -lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \
+ -o $$OUT/dirs_fuzzer
+
+manifest_corpus.zip:
+   python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip
+
 manifest_fuzzer: manifest.cc manifest.o charencode.o parsers.o dirs.o 
pathencode.o revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
  -Wno-register -Wno-macro-redefined \
@@ -113,9 +124,6 @@
  -lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \
  -o $$OUT/manifest_fuzzer
 
-manifest_corpus.zip:
-   python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip
-
 revlog_fuzzer: revlog.cc manifest.o charencode.o parsers.o dirs.o pathencode.o 
revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
  -Wno-register -Wno-macro-redefined \
@@ -155,6 +163,6 @@
  mpatch \
  xdiff
 
-oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer 
manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip 
dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer 
fm1readmarkers_corpus.zip
+oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer 
dirs_fuzzer manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip 
dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer 
fm1readmarkers_corpus.zip
 
 .PHONY: all clean oss-fuzz



To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7031: fuzz: new fuzzer for dirs.c

2019-10-09 Thread durin42 (Augie Fackler)

durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This found a six-year-old bug immediately, and then I put it through a
  few CPU-days of time before sending it.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7031

AFFECTED FILES
  contrib/fuzz/Makefile
  contrib/fuzz/dirs.cc

CHANGE DETAILS

diff --git a/contrib/fuzz/dirs.cc b/contrib/fuzz/dirs.cc
new file mode 100644
--- /dev/null
+++ b/contrib/fuzz/dirs.cc
@@ -0,0 +1,56 @@
+#include 
+#include 
+#include 
+#include 
+
+#include "pyutil.h"
+
+#include 
+
+extern "C" {
+
+static PyCodeObject *code;
+
+extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+contrib::initpy(*argv[0]);
+code = (PyCodeObject *)Py_CompileString(R"py(
+from parsers import dirs
+try:
+  files = mdata.split('\n')
+  d = dirs(files)
+  list(d)
+  'a' in d
+  if files:
+files[0] in d
+except Exception as e:
+  pass
+  # uncomment this print if you're editing this Python code
+  # to debug failures.
+  # print e
+)py",
+"fuzzer", Py_file_input);
+return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
+{
+// Don't allow fuzzer inputs larger than 100k, since we'll just bog
+// down and not accomplish much.
+if (Size > 10) {
+return 0;
+}
+PyObject *mtext =
+PyBytes_FromStringAndSize((const char *)Data, (Py_ssize_t)Size);
+PyObject *locals = PyDict_New();
+PyDict_SetItemString(locals, "mdata", mtext);
+PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);
+if (!res) {
+PyErr_Print();
+}
+Py_XDECREF(res);
+Py_DECREF(locals);
+Py_DECREF(mtext);
+return 0; // Non-zero return values are reserved for future use.
+}
+}
diff --git a/contrib/fuzz/Makefile b/contrib/fuzz/Makefile
--- a/contrib/fuzz/Makefile
+++ b/contrib/fuzz/Makefile
@@ -105,6 +105,17 @@
  -I../../mercurial \
  -c -o revlog.o ../../mercurial/cext/revlog.c
 
+dirs_fuzzer: dirs.cc manifest.o charencode.o parsers.o dirs.o pathencode.o 
revlog.o pyutil.o
+   $(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
+ -Wno-register -Wno-macro-redefined \
+ -I../../mercurial dirs.cc \
+ manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o 
pyutil.o \
+ -lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \
+ -o $$OUT/dirs_fuzzer
+
+manifest_corpus.zip:
+   python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip
+
 manifest_fuzzer: manifest.cc manifest.o charencode.o parsers.o dirs.o 
pathencode.o revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
  -Wno-register -Wno-macro-redefined \
@@ -113,9 +124,6 @@
  -lFuzzingEngine `$$OUT/sanpy/bin/python-config --ldflags` \
  -o $$OUT/manifest_fuzzer
 
-manifest_corpus.zip:
-   python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip
-
 revlog_fuzzer: revlog.cc manifest.o charencode.o parsers.o dirs.o pathencode.o 
revlog.o pyutil.o
$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \
  -Wno-register -Wno-macro-redefined \
@@ -155,6 +163,6 @@
  mpatch \
  xdiff
 
-oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer 
manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip 
dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer 
fm1readmarkers_corpus.zip
+oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer 
dirs_fuzzer manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip 
dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer 
fm1readmarkers_corpus.zip
 
 .PHONY: all clean oss-fuzz



To: durin42, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7031: fuzz: new fuzzer for dirs.c

D7031: fuzz: new fuzzer for dirs.c

2 matches

Site Navigation

Mail list logo

Footer information