Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Go] remove "-lpthread" flag from "compile_fuzzer" and fix comments (#2714). #3657

Merged
merged 3 commits into from
Apr 16, 2020
Merged

[Go] remove "-lpthread" flag from "compile_fuzzer" and fix comments (#2714). #3657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b881b6a
[Go] remove "-lpthread" flag from "compile_fuzzer" and fix comments (…
Dor1s Apr 16, 2020
9bb652f
fix unrelated go-dns and gonids errors
Dor1s Apr 16, 2020
b9d3d8c
simplify golang/build.sh as per Abhishek's comment
Dor1s Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/getting-started/new-project-guide/go_lang.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ function compile_fuzzer {
function=$2
fuzzer=$3

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -func $function -o $fuzzer.a $path

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o $OUT/$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer
}

compile_fuzzer ./pkg/compiler Fuzz compiler_fuzzer
Expand Down
19 changes: 11 additions & 8 deletions projects/go-attestation/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,23 @@
#
################################################################################

# Based on the function from oss-fuzz/projects/golang/build.sh script.
function compile_fuzzer {
package=$1
function=$2
fuzzer=$3

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -func $function -o $fuzzer.a $package

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o $OUT/$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer
}

compile_fuzzer github.com/google/go-attestation/attest FuzzParseEventLog parse_event_log_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseAKPublic12 parse_ak_public12_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseAKPublic20 parse_ak_public20_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseEKCertificate parse_ek_certificate_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseEventLog \
parse_event_log_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseAKPublic12 \
parse_ak_public12_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseAKPublic20 \
parse_ak_public20_fuzzer
compile_fuzzer github.com/google/go-attestation/attest FuzzParseEKCertificate \
parse_ek_certificate_fuzzer
13 changes: 6 additions & 7 deletions projects/go-dns/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@
#
################################################################################

# build target function
function compile_fuzzer {
path=$1
function=$2
fuzzer=$3

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -tags fuzz -func $function -o $fuzzer.a $path

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o $OUT/$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer
}

#same as usual except for added -tags fuzz
compile_fuzzer /root/go/src/github.com/miekg/dns/ FuzzNewRR fuzz_newrr
compile_fuzzer /root/go/src/github.com/miekg/dns/ Fuzz fuzz_msg_unpack
# Same as usual except for added -tags fuzz.
compile_fuzzer github.com/miekg/dns FuzzNewRR fuzz_newrr
compile_fuzzer github.com/miekg/dns Fuzz fuzz_msg_unpack
7 changes: 3 additions & 4 deletions projects/go-json-iterator/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
#
################################################################################

# build target function
function compile_fuzzer {
path=$1
function=$2
fuzzer=$3

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -func $function -o $fuzzer.a $path

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o $OUT/$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer
}

compile_fuzzer . Fuzz fuzz_json
22 changes: 8 additions & 14 deletions projects/golang/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,17 @@
# limitations under the License.

function compile_fuzzer {
fuzzer=$(basename $1)
fuzzer=$(basename $1)

# Instrument all Go files relevant to this fuzzer, compile and store in $fuzzer.a
go-fuzz -o $fuzzer.a github.com/dvyukov/go-fuzz-corpus/$fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -o $fuzzer.a github.com/dvyukov/go-fuzz-corpus/$fuzzer

# Instrumented, compiled Go ($fuzzer.a) + libFuzzer = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o fuzzer-$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/fuzzer-$fuzzer

# Copy the fuzzer binary
cp fuzzer-$fuzzer $OUT

# Pack the seed corpus
zip -r fuzzer-${fuzzer}_seed_corpus.zip \
$GOPATH/src/github.com/dvyukov/go-fuzz-corpus/$fuzzer/corpus

# Copy the seed corpus
cp fuzzer-${fuzzer}_seed_corpus.zip $OUT
# Pack the seed corpus
zip -r $OUT/fuzzer-${fuzzer}_seed_corpus.zip \
$GOPATH/src/github.com/dvyukov/go-fuzz-corpus/$fuzzer/corpus
}

export -f compile_fuzzer
Expand Down
2 changes: 1 addition & 1 deletion projects/gonids/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ RUN go get github.com/google/gonids
ADD https://rules.emergingthreats.net/open/suricata/emerging.rules.zip emerging.rules.zip

COPY build.sh $SRC/
WORKDIR $SRC/
WORKDIR $SRC
9 changes: 4 additions & 5 deletions projects/gonids/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@
#
################################################################################

# build target function
function compile_fuzzer {
path=$1
function=$2
fuzzer=$3

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -func $function -o $fuzzer.a $path

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o $OUT/$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer
}

compile_fuzzer /root/go/src/github.com/google/gonids/ FuzzParseRule fuzz_parserule
compile_fuzzer github.com/google/gonids FuzzParseRule fuzz_parserule
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to remove RUN go get github.com/google/gonids from Dockerfile.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? I think that commands checks out the project to fuzz

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad!, skip.


unzip emerging.rules.zip
cd rules
Expand Down
7 changes: 3 additions & 4 deletions projects/kubernetes/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@ set -o pipefail
set -o errexit
set -x

# Based on the function from oss-fuzz/projects/golang/build.sh script.
function compile_fuzzer {
local pkg=$1
local function=$2
local fuzzer="${pkg}_${function}"

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -func "${function}" -o "${fuzzer}.a" "k8s.io/kubernetes/test/fuzz/${pkg}"

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE "${fuzzer}.a" -lpthread -o "${OUT}/${fuzzer}"
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE "${fuzzer}.a" -o "${OUT}/${fuzzer}"
}

compile_fuzzer "yaml" "FuzzDurationStrict"
Expand Down
7 changes: 3 additions & 4 deletions projects/syzkaller/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
#
################################################################################

# Based on the function from oss-fuzz/projects/golang/build.sh script.
function compile_fuzzer {
path=$1
function=$2
fuzzer=$3

# Instrument all Go files relevant to this fuzzer
# Compile and instrument all Go files relevant to this fuzz target.
go-fuzz -func $function -o $fuzzer.a $path

# Instrumented, compiled Go ($fuzzer.a) + fuzzing engine = fuzzer binary
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -lpthread -o $OUT/$fuzzer
# Link Go code ($fuzzer.a) with fuzzing engine to produce fuzz target binary.
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer
}

compile_fuzzer ./pkg/compiler Fuzz compiler_fuzzer
Expand Down