github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove mainfuzz package and StartDaemonForFuzzing

Browse Source 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato 2022-06-21 15:33:53 +00:00
parent 17f9c3a0ef
commit ca5637104b
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/fuzz/containerd_import_fuzzer.go
View File

@ -25,7 +25,7 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd" "github.com/containerd/containerd"
_ "github.com/containerd/containerd/cmd/containerd" _ "github.com/containerd/containerd/cmd/containerd/builtins"
"github.com/containerd/containerd/cmd/containerd/command" "github.com/containerd/containerd/cmd/containerd/command"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
) )
@ -40,6 +40,11 @@ var (
initDaemon sync.Once initDaemon sync.Once
) )
func startDaemonForFuzzing(arguments []string) {
app := command.App()
_ = app.Run(arguments)
}
func startDaemon() { func startDaemon() {
args := []string{"--log-level", "debug"} args := []string{"--log-level", "debug"}
go func() { go func() {
@ -47,7 +52,7 @@ func startDaemon() {
// containerd binary. // containerd binary.
// See contrib/fuzz/oss_fuzz_build.sh // See contrib/fuzz/oss_fuzz_build.sh
// for more info. // for more info.
command.StartDaemonForFuzzing(args) startDaemonForFuzzing(args)
}() }()
time.Sleep(time.Second * 4) time.Sleep(time.Second * 4)
} }

20
contrib/fuzz/oss_fuzz_build.sh
View File

@ -62,26 +62,6 @@ rm -r vendor
# Change path of socket since OSS-fuzz does not grant access to /run # Change path of socket since OSS-fuzz does not grant access to /run
sed -i 's/\/run\/containerd/\/tmp\/containerd/g' $SRC/containerd/defaults/defaults_unix.go sed -i 's/\/run\/containerd/\/tmp\/containerd/g' $SRC/containerd/defaults/defaults_unix.go
# To build FuzzContainer2 we need to prepare a few things:
# We change the name of the cmd/containerd package
# so that we can import it.
# We furthermore add an exported function that is similar
# to cmd/containerd.main and call that instead of calling
# the containerd binary.
#
# In the fuzzer we import cmd/containerd as a low-maintenance
# way of initializing all the plugins.
# Make backup of cmd/containerd:
cp -r $SRC/containerd/cmd/containerd $SRC/cmd-containerd-backup
# Rename package:
find $SRC/containerd/cmd/containerd -type f -exec sed -i 's/package main/package mainfuzz/g' {} \;
# Add an exported function
sed -i -e '$afunc StartDaemonForFuzzing(arguments []string) {\n\tapp := App()\n\t_ = app.Run(arguments)\n}' $SRC/containerd/cmd/containerd/command/main.go
# Build fuzzer:
compile_go_fuzzer github.com/containerd/containerd/contrib/fuzz FuzzContainerdImport fuzz_containerd_import
# Reinstante backup of cmd/containerd:
mv $SRC/cmd-containerd-backup $SRC/containerd/cmd/containerd
# Compile more fuzzers # Compile more fuzzers
mv $SRC/containerd/filters/filter_test.go $SRC/containerd/filters/filter_test_fuzz.go mv $SRC/containerd/filters/filter_test.go $SRC/containerd/filters/filter_test_fuzz.go
go get github.com/AdamKorcz/go-118-fuzz-build/utils go get github.com/AdamKorcz/go-118-fuzz-build/utils