From 4e1aade2feeb2b9c8b40426b39296d2ae9aa0b99 Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Sat, 8 Dec 2018 11:00:59 +0100 Subject: pkg/report: pass the target to each OS report constructor In order to use the already defined kernel name in sys/targets to reduce duplications. --- pkg/report/fuchsia.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkg/report/fuchsia.go') diff --git a/pkg/report/fuchsia.go b/pkg/report/fuchsia.go index 11b8c1a35..725c0b302 100644 --- a/pkg/report/fuchsia.go +++ b/pkg/report/fuchsia.go @@ -13,6 +13,7 @@ import ( "strings" "github.com/google/syzkaller/pkg/symbolizer" + "github.com/google/syzkaller/sys/targets" "github.com/ianlancetaylor/demangle" ) @@ -38,12 +39,13 @@ var ( } ) -func ctorFuchsia(kernelSrc, kernelObj string, ignores []*regexp.Regexp) (Reporter, []string, error) { +func ctorFuchsia(target *targets.Target, kernelSrc, kernelObj string, + ignores []*regexp.Regexp) (Reporter, []string, error) { ctx := &fuchsia{ ignores: ignores, } if kernelObj != "" { - ctx.obj = filepath.Join(kernelObj, "zircon.elf") + ctx.obj = filepath.Join(kernelObj, target.KernelObject) } suppressions := []string{ "fatal exception: process /tmp/syz-fuzzer", // OOM presumably -- cgit mrf-deployment