all: use consistent file permissions

Currently we have unix permissions for new files/dirs
hardcoded throughout the code base. Some places use 0644,
some - 0640, some - 0600 and a variety of other constants.

Introduce osutil.MkdirAll/WriteFile that use the default
permissions and use them throughout the code base.

This makes permissions consistent and also allows to easily
change the permissions later if we change our minds.

Also merge pkg/fileutil into pkg/osutil as they become
dependent on each other. The line between them was poorly
defined anyway as both operate on files.

1 files changed, 5 insertions, 6 deletions

diff --git a/pkg/kernel/kernel.go b/pkg/kernel/kernel.go
index c38020b59..208b61815 100644
--- a/pkg/kernel/kernel.go
+++ b/pkg/kernel/kernel.go
@@ -21,12 +21,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/syzkaller/pkg/fileutil"
 	"github.com/google/syzkaller/pkg/osutil"
 )
 
 func Build(dir, compiler, config string) error {
-	if err := fileutil.CopyFile(config, filepath.Join(dir, ".config")); err != nil {
+	if err := osutil.CopyFile(config, filepath.Join(dir, ".config")); err != nil {
 		return fmt.Errorf("failed to write config file: %v", err)
 	}
 	return build(dir, compiler)
@@ -37,7 +36,7 @@ func BuildWithPartConfig(dir, compiler, config string) error {
 	const timeout = 10 * time.Minute // default timeout for command invocations
 	os.Remove(filepath.Join(dir, ".config"))
 	configFile := filepath.Join(dir, "syz.config")
-	if err := ioutil.WriteFile(configFile, []byte(config), 0600); err != nil {
+	if err := osutil.WriteFile(configFile, []byte(config)); err != nil {
 		return fmt.Errorf("failed to write config file: %v", err)
 	}
 	defer os.Remove(configFile)
@@ -77,17 +76,17 @@ func CreateImage(kernelDir, userspaceDir, image, sshkey string) error {
 	}
 	defer os.RemoveAll(tempDir)
 	scriptFile := filepath.Join(tempDir, "create.sh")
-	if err := ioutil.WriteFile(scriptFile, []byte(createImageScript), 0700); err != nil {
+	if err := osutil.WriteExecFile(scriptFile, []byte(createImageScript)); err != nil {
 		return fmt.Errorf("failed to write script file: %v", err)
 	}
 	bzImage := filepath.Join(kernelDir, filepath.FromSlash("arch/x86/boot/bzImage"))
 	if _, err := osutil.RunCmd(time.Hour, tempDir, scriptFile, userspaceDir, bzImage); err != nil {
 		return fmt.Errorf("image build failed: %v", err)
 	}
-	if err := fileutil.CopyFile(filepath.Join(tempDir, "disk.raw"), image); err != nil {
+	if err := osutil.CopyFile(filepath.Join(tempDir, "disk.raw"), image); err != nil {
 		return err
 	}
-	if err := fileutil.CopyFile(filepath.Join(tempDir, "key"), sshkey); err != nil {
+	if err := osutil.CopyFile(filepath.Join(tempDir, "key"), sshkey); err != nil {
 		return err
 	}
 	if err := os.Chmod(sshkey, 0600); err != nil {