From 4c4905f8ed13195effcc4c30bbf2dfca14be3a4b Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 30 Nov 2020 18:14:38 +0100 Subject: tools/syz-symbolize: fix config loading Config target is not initialized with the hacky way we fabricate the config. Load config in a more standard way. --- tools/syz-symbolize/symbolize.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go index 39973664d..aa9c072cb 100644 --- a/tools/syz-symbolize/symbolize.go +++ b/tools/syz-symbolize/symbolize.go @@ -33,14 +33,14 @@ func main() { flag.PrintDefaults() os.Exit(1) } - cfg := &mgrconfig.Config{ - Derived: mgrconfig.Derived{ - TargetOS: *flagOS, - TargetArch: *flagArch, - TargetVMArch: *flagArch, - }, - KernelObj: *flagKernelObj, - KernelSrc: *flagKernelSrc, + cfg, err := mgrconfig.LoadPartialData([]byte(`{ + "kernel_obj": "` + *flagKernelObj + `", + "kernel_src": "` + *flagKernelSrc + `", + "target": "` + *flagOS + "/" + *flagArch + `" +}`)) + if err != nil { + fmt.Fprintf(os.Stderr, "%v\n", err) + os.Exit(1) } cfg.CompleteKernelDirs() reporter, err := report.NewReporter(cfg) -- cgit mrf-deployment