From c1f024779fe09f870f11f7b32033892587a4dafb Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Mon, 16 Apr 2018 20:27:17 +0000 Subject: [PATCH] hfuzz: separate _workspace and _input directories, add workspace to .gitignore --- .gitignore | 4 ++++ ...0ea53686eec1c6271d137cb31.000000b2.honggfuzz.cov | Bin ...eeeeeeeee8affeeeeeeee1b1b.00000009.honggfuzz.cov | 0 ...ef1200000910e61f021200000.00000005.honggfuzz.cov | 0 ...00000000001b1b00000000000.00000002.honggfuzz.cov | 0 ...00d8000000d800dc53a700000.00000005.honggfuzz.cov | Bin ...0000000000000000000000000.00000001.honggfuzz.cov | Bin ...00000000085c1a00000000000.00000003.honggfuzz.cov | Bin ...d05965308ce0891358594659c.00000b1d.honggfuzz.cov | Bin ...0000000009090000000000000.00000001.honggfuzz.cov | 0 ...0000000009120000000000000.00000001.honggfuzz.cov | 0 ...00000000093f0000000000000.00000001.honggfuzz.cov | 0 ...000000000b885b00000000000.00000002.honggfuzz.cov | 0 ...0e0000000e05c88c5b0000000.00000004.honggfuzz.cov | 0 ...000000000e540000000000000.00000001.honggfuzz.cov | 0 .../input/id:000016,src:000000,op:havoc,rep:32 | Bin .../input/id:000017,src:000000,op:havoc,rep:128 | 0 .../input/id:000018,src:000000,op:havoc,rep:32 | Bin .../input/id:000019,src:000000,op:havoc,rep:64 | Bin .../input/id:000022,src:000007,op:havoc,rep:8 | Bin .../input/id:000023,src:000007,op:havoc,rep:128 | 0 .../input/id:000024,src:000022,op:havoc,rep:64 | Bin .../input/id:000025,src:000023,op:havoc,rep:16 | Bin .../id:000026,src:000011,op:int16,pos:2,val:+0 | Bin .../id:000027,src:000011,op:int32,pos:1,val:+256 | Bin .../input/id:000028,src:000011,op:havoc,rep:2 | Bin .../input/id:000030,src:000011,op:havoc,rep:16 | Bin fuzz/travis-fuzz.sh | 6 +++++- 28 files changed, 9 insertions(+), 1 deletion(-) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/6c8f7030ea53686eec1c6271d137cb31.000000b2.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000000,orig:e17a1beeeeeeeeee8affeeeeeeee1b1b.00000009.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000001,orig:9160b19ef1200000910e61f021200000.00000005.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000002,orig:01b1b0000000000001b1b00000000000.00000002.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000003,orig:2a351d800d8000000d800dc53a700000.00000005.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000004,orig:00000000000000000000000000000000.00000001.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000005,orig:00b125700000000085c1a00000000000.00000003.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000006,orig:39d67a2d05965308ce0891358594659c.00000b1d.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000007,orig:90900000000000009090000000000000.00000001.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000008,orig:91200000000000009120000000000000.00000001.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000009,orig:93f000000000000093f0000000000000.00000001.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000010,orig:b508300000000000b885b00000000000.00000002.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000011,orig:b518ccc0e0000000e05c88c5b0000000.00000004.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000012,orig:e540000000000000e540000000000000.00000001.honggfuzz.cov (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000016,src:000000,op:havoc,rep:32 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000017,src:000000,op:havoc,rep:128 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000018,src:000000,op:havoc,rep:32 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000019,src:000000,op:havoc,rep:64 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000022,src:000007,op:havoc,rep:8 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000023,src:000007,op:havoc,rep:128 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000024,src:000022,op:havoc,rep:64 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000025,src:000023,op:havoc,rep:16 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000026,src:000011,op:int16,pos:2,val:+0 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000027,src:000011,op:int32,pos:1,val:+256 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000028,src:000011,op:havoc,rep:2 (100%) rename fuzz/{hfuzz_workspace => hfuzz_input}/deserialize_script/input/id:000030,src:000011,op:havoc,rep:16 (100%) diff --git a/.gitignore b/.gitignore index 000860e1..93426a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ target Cargo.lock +#fuzz +fuzz/hfuzz_target +fuzz/hfuzz_workspace + #IntelliJ project files .idea *.iml diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/6c8f7030ea53686eec1c6271d137cb31.000000b2.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/6c8f7030ea53686eec1c6271d137cb31.000000b2.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/6c8f7030ea53686eec1c6271d137cb31.000000b2.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/6c8f7030ea53686eec1c6271d137cb31.000000b2.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000000,orig:e17a1beeeeeeeeee8affeeeeeeee1b1b.00000009.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000000,orig:e17a1beeeeeeeeee8affeeeeeeee1b1b.00000009.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000000,orig:e17a1beeeeeeeeee8affeeeeeeee1b1b.00000009.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000000,orig:e17a1beeeeeeeeee8affeeeeeeee1b1b.00000009.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000001,orig:9160b19ef1200000910e61f021200000.00000005.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000001,orig:9160b19ef1200000910e61f021200000.00000005.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000001,orig:9160b19ef1200000910e61f021200000.00000005.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000001,orig:9160b19ef1200000910e61f021200000.00000005.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000002,orig:01b1b0000000000001b1b00000000000.00000002.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000002,orig:01b1b0000000000001b1b00000000000.00000002.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000002,orig:01b1b0000000000001b1b00000000000.00000002.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000002,orig:01b1b0000000000001b1b00000000000.00000002.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000003,orig:2a351d800d8000000d800dc53a700000.00000005.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000003,orig:2a351d800d8000000d800dc53a700000.00000005.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000003,orig:2a351d800d8000000d800dc53a700000.00000005.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000003,orig:2a351d800d8000000d800dc53a700000.00000005.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000004,orig:00000000000000000000000000000000.00000001.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000004,orig:00000000000000000000000000000000.00000001.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000004,orig:00000000000000000000000000000000.00000001.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000004,orig:00000000000000000000000000000000.00000001.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000005,orig:00b125700000000085c1a00000000000.00000003.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000005,orig:00b125700000000085c1a00000000000.00000003.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000005,orig:00b125700000000085c1a00000000000.00000003.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000005,orig:00b125700000000085c1a00000000000.00000003.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000006,orig:39d67a2d05965308ce0891358594659c.00000b1d.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000006,orig:39d67a2d05965308ce0891358594659c.00000b1d.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000006,orig:39d67a2d05965308ce0891358594659c.00000b1d.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000006,orig:39d67a2d05965308ce0891358594659c.00000b1d.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000007,orig:90900000000000009090000000000000.00000001.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000007,orig:90900000000000009090000000000000.00000001.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000007,orig:90900000000000009090000000000000.00000001.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000007,orig:90900000000000009090000000000000.00000001.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000008,orig:91200000000000009120000000000000.00000001.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000008,orig:91200000000000009120000000000000.00000001.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000008,orig:91200000000000009120000000000000.00000001.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000008,orig:91200000000000009120000000000000.00000001.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000009,orig:93f000000000000093f0000000000000.00000001.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000009,orig:93f000000000000093f0000000000000.00000001.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000009,orig:93f000000000000093f0000000000000.00000001.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000009,orig:93f000000000000093f0000000000000.00000001.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000010,orig:b508300000000000b885b00000000000.00000002.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000010,orig:b508300000000000b885b00000000000.00000002.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000010,orig:b508300000000000b885b00000000000.00000002.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000010,orig:b508300000000000b885b00000000000.00000002.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000011,orig:b518ccc0e0000000e05c88c5b0000000.00000004.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000011,orig:b518ccc0e0000000e05c88c5b0000000.00000004.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000011,orig:b518ccc0e0000000e05c88c5b0000000.00000004.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000011,orig:b518ccc0e0000000e05c88c5b0000000.00000004.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000012,orig:e540000000000000e540000000000000.00000001.honggfuzz.cov b/fuzz/hfuzz_input/deserialize_script/input/id:000012,orig:e540000000000000e540000000000000.00000001.honggfuzz.cov similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000012,orig:e540000000000000e540000000000000.00000001.honggfuzz.cov rename to fuzz/hfuzz_input/deserialize_script/input/id:000012,orig:e540000000000000e540000000000000.00000001.honggfuzz.cov diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000016,src:000000,op:havoc,rep:32 b/fuzz/hfuzz_input/deserialize_script/input/id:000016,src:000000,op:havoc,rep:32 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000016,src:000000,op:havoc,rep:32 rename to fuzz/hfuzz_input/deserialize_script/input/id:000016,src:000000,op:havoc,rep:32 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000017,src:000000,op:havoc,rep:128 b/fuzz/hfuzz_input/deserialize_script/input/id:000017,src:000000,op:havoc,rep:128 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000017,src:000000,op:havoc,rep:128 rename to fuzz/hfuzz_input/deserialize_script/input/id:000017,src:000000,op:havoc,rep:128 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000018,src:000000,op:havoc,rep:32 b/fuzz/hfuzz_input/deserialize_script/input/id:000018,src:000000,op:havoc,rep:32 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000018,src:000000,op:havoc,rep:32 rename to fuzz/hfuzz_input/deserialize_script/input/id:000018,src:000000,op:havoc,rep:32 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000019,src:000000,op:havoc,rep:64 b/fuzz/hfuzz_input/deserialize_script/input/id:000019,src:000000,op:havoc,rep:64 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000019,src:000000,op:havoc,rep:64 rename to fuzz/hfuzz_input/deserialize_script/input/id:000019,src:000000,op:havoc,rep:64 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000022,src:000007,op:havoc,rep:8 b/fuzz/hfuzz_input/deserialize_script/input/id:000022,src:000007,op:havoc,rep:8 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000022,src:000007,op:havoc,rep:8 rename to fuzz/hfuzz_input/deserialize_script/input/id:000022,src:000007,op:havoc,rep:8 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000023,src:000007,op:havoc,rep:128 b/fuzz/hfuzz_input/deserialize_script/input/id:000023,src:000007,op:havoc,rep:128 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000023,src:000007,op:havoc,rep:128 rename to fuzz/hfuzz_input/deserialize_script/input/id:000023,src:000007,op:havoc,rep:128 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000024,src:000022,op:havoc,rep:64 b/fuzz/hfuzz_input/deserialize_script/input/id:000024,src:000022,op:havoc,rep:64 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000024,src:000022,op:havoc,rep:64 rename to fuzz/hfuzz_input/deserialize_script/input/id:000024,src:000022,op:havoc,rep:64 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000025,src:000023,op:havoc,rep:16 b/fuzz/hfuzz_input/deserialize_script/input/id:000025,src:000023,op:havoc,rep:16 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000025,src:000023,op:havoc,rep:16 rename to fuzz/hfuzz_input/deserialize_script/input/id:000025,src:000023,op:havoc,rep:16 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000026,src:000011,op:int16,pos:2,val:+0 b/fuzz/hfuzz_input/deserialize_script/input/id:000026,src:000011,op:int16,pos:2,val:+0 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000026,src:000011,op:int16,pos:2,val:+0 rename to fuzz/hfuzz_input/deserialize_script/input/id:000026,src:000011,op:int16,pos:2,val:+0 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000027,src:000011,op:int32,pos:1,val:+256 b/fuzz/hfuzz_input/deserialize_script/input/id:000027,src:000011,op:int32,pos:1,val:+256 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000027,src:000011,op:int32,pos:1,val:+256 rename to fuzz/hfuzz_input/deserialize_script/input/id:000027,src:000011,op:int32,pos:1,val:+256 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000028,src:000011,op:havoc,rep:2 b/fuzz/hfuzz_input/deserialize_script/input/id:000028,src:000011,op:havoc,rep:2 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000028,src:000011,op:havoc,rep:2 rename to fuzz/hfuzz_input/deserialize_script/input/id:000028,src:000011,op:havoc,rep:2 diff --git a/fuzz/hfuzz_workspace/deserialize_script/input/id:000030,src:000011,op:havoc,rep:16 b/fuzz/hfuzz_input/deserialize_script/input/id:000030,src:000011,op:havoc,rep:16 similarity index 100% rename from fuzz/hfuzz_workspace/deserialize_script/input/id:000030,src:000011,op:havoc,rep:16 rename to fuzz/hfuzz_input/deserialize_script/input/id:000030,src:000011,op:havoc,rep:16 diff --git a/fuzz/travis-fuzz.sh b/fuzz/travis-fuzz.sh index 5129799a..ae85ea91 100755 --- a/fuzz/travis-fuzz.sh +++ b/fuzz/travis-fuzz.sh @@ -4,7 +4,11 @@ cargo install --force honggfuzz for TARGET in fuzz_targets/*; do FILENAME=$(basename $TARGET) FILE="${FILENAME%.*}" - HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" HFUZZ_RUN_ARGS="-N1000000 --exit_upon_crash -v" cargo hfuzz run $FILE + if [ -d hfuzz_input/$FILE ]; then + HFUZZ_INPUT_ARGS="-f hfuzz_input/$FILE/input" + fi + HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" HFUZZ_RUN_ARGS="-N1000000 --exit_upon_crash -v $HFUZZ_INPUT_ARGS" cargo hfuzz run $FILE + if [ -f hfuzz_workspace/$FILE/HONGGFUZZ.REPORT.TXT ]; then cat hfuzz_workspace/$FILE/HONGGFUZZ.REPORT.TXT for CASE in hfuzz_workspace/$FILE/SIG*; do