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/linux.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkg/report/linux.go') diff --git a/pkg/report/linux.go b/pkg/report/linux.go index 77b1c0bac..bfd6c45b6 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -16,6 +16,7 @@ import ( "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/symbolizer" + "github.com/google/syzkaller/sys/targets" ) type linux struct { @@ -32,11 +33,11 @@ type linux struct { eoi []byte } -func ctorLinux(kernelSrc, kernelObj string, ignores []*regexp.Regexp) (Reporter, []string, error) { - vmlinux := "" +func ctorLinux(target *targets.Target, kernelSrc, kernelObj string, ignores []*regexp.Regexp) (Reporter, []string, error) { var symbols map[string][]symbolizer.Symbol + vmlinux := "" if kernelObj != "" { - vmlinux = filepath.Join(kernelObj, "vmlinux") + vmlinux = filepath.Join(kernelObj, target.KernelObject) var err error symbols, err = symbolizer.ReadSymbols(vmlinux) if err != nil { -- cgit mrf-deployment