From 8d48456885907439825fa265e0c375da5fdf1ecd Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 3 Sep 2019 10:25:42 +0200 Subject: tools/syz-symbolize: fix kernel dir calculation syz-symbolize did not use the common mgrconfig logic to calculate kernel dirs. Thus KernelBuildSrc ended up empty, +dirs were not extended to absolute paths. Use the common mgrconfig logic to calculate kernel dirs. --- tools/syz-symbolize/symbolize.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tools/syz-symbolize') diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go index 2dc814505..5f88e68cd 100644 --- a/tools/syz-symbolize/symbolize.go +++ b/tools/syz-symbolize/symbolize.go @@ -17,8 +17,8 @@ import ( var ( flagOS = flag.String("os", runtime.GOOS, "target os") flagArch = flag.String("arch", runtime.GOARCH, "target arch") - flagKernelSrc = flag.String("kernel_src", ".", "path to kernel sources") flagKernelObj = flag.String("kernel_obj", ".", "path to kernel build/obj dir") + flagKernelSrc = flag.String("kernel_src", "", "path to kernel sources (defaults to kernel_obj)") ) func main() { @@ -29,11 +29,13 @@ func main() { os.Exit(1) } cfg := &mgrconfig.Config{ - TargetOS: *flagOS, - TargetArch: *flagArch, - KernelObj: *flagKernelObj, - KernelSrc: *flagKernelSrc, + TargetOS: *flagOS, + TargetArch: *flagArch, + TargetVMArch: *flagArch, + KernelObj: *flagKernelObj, + KernelSrc: *flagKernelSrc, } + cfg.CompleteKernelDirs() reporter, err := report.NewReporter(cfg) if err != nil { fmt.Fprintf(os.Stderr, "failed to create reporter: %v\n", err) -- cgit mrf-deployment