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. --- pkg/mgrconfig/load.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'pkg/mgrconfig/load.go') diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go index a4cbc8914..f02f3c59c 100644 --- a/pkg/mgrconfig/load.go +++ b/pkg/mgrconfig/load.go @@ -105,15 +105,8 @@ func Complete(cfg *Config) error { if err := checkSSHParams(cfg); err != nil { return err } + cfg.CompleteKernelDirs() - cfg.KernelObj = osutil.Abs(cfg.KernelObj) - if cfg.KernelSrc == "" { - cfg.KernelSrc = cfg.KernelObj // assume in-tree build by default - } - cfg.KernelSrc = osutil.Abs(cfg.KernelSrc) - if cfg.KernelBuildSrc == "" { - cfg.KernelBuildSrc = cfg.KernelSrc - } if cfg.HubClient != "" && (cfg.Name == "" || cfg.HubAddr == "" || cfg.HubKey == "") { return fmt.Errorf("hub_client is set, but name/hub_addr/hub_key is empty") } @@ -126,6 +119,17 @@ func Complete(cfg *Config) error { return nil } +func (cfg *Config) CompleteKernelDirs() { + cfg.KernelObj = osutil.Abs(cfg.KernelObj) + if cfg.KernelSrc == "" { + cfg.KernelSrc = cfg.KernelObj // assume in-tree build by default + } + cfg.KernelSrc = osutil.Abs(cfg.KernelSrc) + if cfg.KernelBuildSrc == "" { + cfg.KernelBuildSrc = cfg.KernelSrc + } +} + func checkSSHParams(cfg *Config) error { if cfg.SSHUser == "" { return fmt.Errorf("bad config syzkaller param: ssh user is empty") -- cgit mrf-deployment