From 2a287a4dfc36295e1a2f0fa1e8c6c061442dc4f5 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 14 May 2018 11:17:23 +0200 Subject: pkg/kernel: accept kernel config as byte slice We usually have the config in memory, so saving it to disk is an unnecessary step. Accept byte slice directly. Update #501 --- pkg/kernel/kernel.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkg/kernel') diff --git a/pkg/kernel/kernel.go b/pkg/kernel/kernel.go index 3cd689d70..a51da8db3 100644 --- a/pkg/kernel/kernel.go +++ b/pkg/kernel/kernel.go @@ -24,9 +24,9 @@ import ( "github.com/google/syzkaller/pkg/osutil" ) -func Build(dir, compiler, config string) error { +func Build(dir, compiler string, config []byte) error { configFile := filepath.Join(dir, ".config") - if err := osutil.CopyFile(config, configFile); err != nil { + if err := osutil.WriteFile(configFile, config); err != nil { return fmt.Errorf("failed to write config file: %v", err) } if err := osutil.SandboxChown(configFile); err != nil { @@ -89,6 +89,7 @@ func CreateImage(kernelDir, userspaceDir, cmdlineFile, sysctlFile, image, sshkey if _, err = osutil.Run(time.Hour, cmd); err != nil { return fmt.Errorf("image build failed: %v", err) } + // Note: we use CopyFile instead of Rename because src and dst can be on different filesystems. if err := osutil.CopyFile(filepath.Join(tempDir, "disk.raw"), image); err != nil { return err } -- cgit mrf-deployment