diff options
| author | Taras Madan <tarasmadan@google.com> | 2023-02-23 14:28:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 14:28:18 +0100 |
| commit | 4359978ef22a22ddd5a19adf18cbc80cb44244fb (patch) | |
| tree | 7952da94e27417b39ddf952d9e0bab431dafc4c5 /sys | |
| parent | 9e2ebb3c174f1e168bc1fbadd5f02f2e25e314fc (diff) | |
all: ioutil is deprecated in go1.19 (#3718)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/syz-extract/extract.go | 3 | ||||
| -rw-r--r-- | sys/syz-extract/fetch.go | 4 | ||||
| -rw-r--r-- | sys/syz-sysgen/sysgen.go | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go index c3629ee17..40ed37f87 100644 --- a/sys/syz-extract/extract.go +++ b/sys/syz-extract/extract.go @@ -7,7 +7,6 @@ import ( "bytes" "flag" "fmt" - "io/ioutil" "os" "path/filepath" "runtime" @@ -187,7 +186,7 @@ func createArches(OS string, archArray, files []string) ([]*Arch, int, error) { for _, archStr := range archArray { buildDir := "" if *flagBuild { - dir, err := ioutil.TempDir("", "syzkaller-kernel-build") + dir, err := os.MkdirTemp("", "syzkaller-kernel-build") if err != nil { return nil, 0, fmt.Errorf("failed to create temp dir: %v", err) } diff --git a/sys/syz-extract/fetch.go b/sys/syz-extract/fetch.go index 12c2f5d7d..dd5123b31 100644 --- a/sys/syz-extract/fetch.go +++ b/sys/syz-extract/fetch.go @@ -8,7 +8,7 @@ import ( "debug/elf" "encoding/binary" "fmt" - "io/ioutil" + "io" "os" "regexp" "strconv" @@ -176,7 +176,7 @@ func extractFromELF(binFile string, targetEndian binary.ByteOrder) ([]uint64, er if sec.Name != "syz_extract_data" { continue } - data, err := ioutil.ReadAll(sec.Open()) + data, err := io.ReadAll(sec.Open()) if err != nil { return nil, err } diff --git a/sys/syz-sysgen/sysgen.go b/sys/syz-sysgen/sysgen.go index 0427272f8..2ac48e94e 100644 --- a/sys/syz-sysgen/sysgen.go +++ b/sys/syz-sysgen/sysgen.go @@ -8,7 +8,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "os" "path/filepath" "reflect" @@ -340,7 +339,7 @@ func writeExecutorSyscalls(data *ExecutorData) { } func writeSource(file string, data []byte) { - if oldSrc, err := ioutil.ReadFile(file); err == nil && bytes.Equal(data, oldSrc) { + if oldSrc, err := os.ReadFile(file); err == nil && bytes.Equal(data, oldSrc) { return } writeFile(file, data) |