all: ioutil is deprecated in go1.19 (#3718)

28 files changed, 56 insertions, 81 deletions

diff --git a/tools/syz-benchcmp/benchcmp.go b/tools/syz-benchcmp/benchcmp.go
index 626809e6c..646a93614 100644
--- a/tools/syz-benchcmp/benchcmp.go
+++ b/tools/syz-benchcmp/benchcmp.go
@@ -13,7 +13,6 @@ import (
 	"flag"
 	"fmt"
 	"html/template"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -224,7 +223,7 @@ func display(graphs []*Graph) {
 	var outf *os.File
 	var err error
 	if *flagOut == "" {
-		outf, err = ioutil.TempFile("", "*.html")
+		outf, err = os.CreateTemp("", "*.html")
 		if err != nil {
 			tool.Failf("failed to create temp file: %v", err)
 		}
diff --git a/tools/syz-bisect/bisect.go b/tools/syz-bisect/bisect.go
index 7fa17c25d..ba4494d18 100644
--- a/tools/syz-bisect/bisect.go
+++ b/tools/syz-bisect/bisect.go
@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -86,7 +85,7 @@ func main() {
 		os.Exit(1)
 	}
 	if mgrcfg.Workdir == "" {
-		mgrcfg.Workdir, err = ioutil.TempDir("", "syz-bisect")
+		mgrcfg.Workdir, err = os.MkdirTemp("", "syz-bisect")
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed to create temp dir: %v\n", err)
 			os.Exit(1)
@@ -150,7 +149,7 @@ func loadFile(path, file string, dst *[]byte, mandatory bool) {
 	if !mandatory && !osutil.IsExist(filename) {
 		return
 	}
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
diff --git a/tools/syz-build/build.go b/tools/syz-build/build.go
index 20461bb7f..4c0ef0f03 100644
--- a/tools/syz-build/build.go
+++ b/tools/syz-build/build.go
@@ -7,7 +7,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"runtime"
 
@@ -36,7 +35,7 @@ func main() {
 		fmt.Printf("not running under root, image build may fail\n")
 	}
 	os.Setenv("SYZ_DISABLE_SANDBOXING", "yes")
-	kernelConfig, err := ioutil.ReadFile(*flagKernelConfig)
+	kernelConfig, err := os.ReadFile(*flagKernelConfig)
 	if err != nil {
 		tool.Fail(err)
 	}
diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go
index 83975a137..1e14a73fa 100644
--- a/tools/syz-cover/syz-cover.go
+++ b/tools/syz-cover/syz-cover.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"runtime"
@@ -112,7 +111,7 @@ func main() {
 func readPCs(files []string) ([]uint64, error) {
 	var pcs []uint64
 	for _, file := range files {
-		data, err := ioutil.ReadFile(file)
+		data, err := os.ReadFile(file)
 		if err != nil {
 			return nil, err
 		}
diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go
index a88041a37..8ed076fc8 100644
--- a/tools/syz-crush/crush.go
+++ b/tools/syz-crush/crush.go
@@ -9,7 +9,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -182,7 +181,7 @@ func runInstance(cfg *mgrconfig.Config, reporter *report.Reporter,
 		res, err = inst.RunSyzProgFile(file, timeout, opts)
 	} else {
 		var src []byte
-		src, err = ioutil.ReadFile(file)
+		src, err = os.ReadFile(file)
 		if err != nil {
 			log.Fatalf("error reading source file from '%s'", file)
 		}
diff --git a/tools/syz-db/syz-db.go b/tools/syz-db/syz-db.go
index d98f282af..8d261307a 100644
--- a/tools/syz-db/syz-db.go
+++ b/tools/syz-db/syz-db.go
@@ -6,7 +6,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -83,13 +82,13 @@ func usage() {
 }
 
 func pack(dir, file string, target *prog.Target, version uint64) {
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		tool.Failf("failed to read dir: %v", err)
 	}
 	var records []db.Record
 	for _, file := range files {
-		data, err := ioutil.ReadFile(filepath.Join(dir, file.Name()))
+		data, err := os.ReadFile(filepath.Join(dir, file.Name()))
 		if err != nil {
 			tool.Failf("failed to read file %v: %v", file.Name(), err)
 		}
@@ -154,7 +153,7 @@ func merge(file string, adds []string, target *prog.Target) {
 		} else if target == nil {
 			tool.Failf("failed to open db %v: %v", add, err)
 		}
-		data, err := ioutil.ReadFile(add)
+		data, err := os.ReadFile(add)
 		if err != nil {
 			tool.Fail(err)
 		}
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index b1d580d96..ec6d59e1e 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"runtime"
 	"sync"
@@ -299,7 +298,7 @@ func loadPrograms(target *prog.Target, files []string) []*prog.Prog {
 			}
 			continue
 		}
-		data, err := ioutil.ReadFile(fn)
+		data, err := os.ReadFile(fn)
 		if err != nil {
 			log.Fatalf("failed to read log file: %v", err)
 		}
diff --git a/tools/syz-expand/expand.go b/tools/syz-expand/expand.go
index a963b04d0..edc06e93e 100644
--- a/tools/syz-expand/expand.go
+++ b/tools/syz-expand/expand.go
@@ -8,7 +8,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"runtime"
 
@@ -34,7 +33,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	data, err := ioutil.ReadFile(*flagProg)
+	data, err := os.ReadFile(*flagProg)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to read prog file: %v\n", err)
 		os.Exit(1)
diff --git a/tools/syz-fmt/syz-fmt.go b/tools/syz-fmt/syz-fmt.go
index 76d6a8eae..36b172388 100644
--- a/tools/syz-fmt/syz-fmt.go
+++ b/tools/syz-fmt/syz-fmt.go
@@ -7,7 +7,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -36,7 +35,7 @@ func main() {
 			os.Exit(1)
 		}
 		if st.IsDir() {
-			files, err := ioutil.ReadDir(arg)
+			files, err := os.ReadDir(arg)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "failed to read dir %v: %v\n", arg, err)
 				os.Exit(1)
@@ -45,7 +44,7 @@ func main() {
 				if !strings.HasSuffix(file.Name(), ".txt") {
 					continue
 				}
-				processFile(filepath.Join(arg, file.Name()), file.Mode())
+				processFile(filepath.Join(arg, file.Name()), file.Type())
 			}
 		} else {
 			processFile(arg, st.Mode())
@@ -54,7 +53,7 @@ func main() {
 }
 
 func processFile(file string, mode os.FileMode) {
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to read file %v: %v\n", file, err)
 		os.Exit(1)
@@ -72,7 +71,7 @@ func processFile(file string, mode os.FileMode) {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	if err := ioutil.WriteFile(file, formatted, mode); err != nil {
+	if err := os.WriteFile(file, formatted, mode); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
diff --git a/tools/syz-hubtool/hubtool.go b/tools/syz-hubtool/hubtool.go
index 916c7e9ab..69175b469 100644
--- a/tools/syz-hubtool/hubtool.go
+++ b/tools/syz-hubtool/hubtool.go
@@ -6,9 +6,9 @@ package main
 
 import (
 	"flag"
-	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"path/filepath"
 	"runtime"
 	"time"
@@ -119,7 +119,7 @@ func loadRepros(target *prog.Target, reproGlob string) [][]byte {
 	var repros [][]byte
 	dedup := make(map[string]bool)
 	for _, file := range files {
-		data, err := ioutil.ReadFile(file)
+		data, err := os.ReadFile(file)
 		if err != nil {
 			log.Fatal(err)
 		}
diff --git a/tools/syz-imagegen/imagegen.go b/tools/syz-imagegen/imagegen.go
index 7cc6ff26f..1fd357f43 100644
--- a/tools/syz-imagegen/imagegen.go
+++ b/tools/syz-imagegen/imagegen.go
@@ -20,7 +20,6 @@ import (
 	"flag"
 	"fmt"
 	"hash/crc32"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -602,7 +601,7 @@ func main() {
 		return
 	}
 	// Create a single template dir for file systems that need the root dir at creation time.
-	templateDir, err := ioutil.TempDir("", "syz-imagegen")
+	templateDir, err := os.MkdirTemp("", "syz-imagegen")
 	if err != nil {
 		tool.Fail(err)
 	}
@@ -810,7 +809,7 @@ func (img *Image) generateSize() error {
 			return fmt.Errorf("image population failed: %v\n%s", err, out)
 		}
 	}
-	data, err := ioutil.ReadFile(img.disk)
+	data, err := os.ReadFile(img.disk)
 	if err != nil {
 		return err
 	}
@@ -843,7 +842,7 @@ func populate(disk, fs string) error {
 	loop := strings.TrimSpace(string(output))
 	defer runCmd("losetup", "-d", loop)
 
-	dir, err := ioutil.TempDir("", "syz-imagegen")
+	dir, err := os.MkdirTemp("", "syz-imagegen")
 	if err != nil {
 		return err
 	}
@@ -866,23 +865,23 @@ func populateDir(dir string) error {
 	if err := os.Mkdir(filepath.Join(dir, "file0"), 0777); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(dir, "file0", "file0"), nonzeros(1050), 0777); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "file0", "file0"), nonzeros(1050), 0777); err != nil {
 		return err
 	}
 	os.Symlink(filepath.Join(dir, "file0", "file0"), filepath.Join(dir, "file0", "file1"))
-	if err := ioutil.WriteFile(filepath.Join(dir, "file1"), nonzeros(10), 0777); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "file1"), nonzeros(10), 0777); err != nil {
 		return err
 	}
 	// Note: some errors are not checked because some file systems don't have support for links/attrs.
 	// TODO: does it make sense to create other attribute types (system./trusted./security./btrfs.)?
 	syscall.Setxattr(filepath.Join(dir, "file1"), "user.xattr1", []byte("xattr1"), 0)
 	syscall.Setxattr(filepath.Join(dir, "file1"), "user.xattr2", []byte("xattr2"), 0)
-	if err := ioutil.WriteFile(filepath.Join(dir, "file2"), zeros(9000), 0777); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "file2"), zeros(9000), 0777); err != nil {
 		return err
 	}
 	os.Link(filepath.Join(dir, "file2"), filepath.Join(dir, "file3"))
 	// f2fs considers .cold extension specially.
-	if err := ioutil.WriteFile(filepath.Join(dir, "file.cold"), nonzeros(100), 0777); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "file.cold"), nonzeros(100), 0777); err != nil {
 		return err
 	}
 	return nil
diff --git a/tools/syz-kcidb/kcidb.go b/tools/syz-kcidb/kcidb.go
index 0e4c2cb4d..c03d4c1f3 100644
--- a/tools/syz-kcidb/kcidb.go
+++ b/tools/syz-kcidb/kcidb.go
@@ -6,7 +6,7 @@ package main
 import (
 	"context"
 	"flag"
-	"io/ioutil"
+	"os"
 
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/kcidb"
@@ -37,7 +37,7 @@ func main() {
 		tool.Fail(err)
 	}
 
-	cred, err := ioutil.ReadFile(*flagCred)
+	cred, err := os.ReadFile(*flagCred)
 	if err != nil {
 		tool.Fail(err)
 	}
diff --git a/tools/syz-kconf/kconf.go b/tools/syz-kconf/kconf.go
index 0d8c48ac2..9b8c8101d 100644
--- a/tools/syz-kconf/kconf.go
+++ b/tools/syz-kconf/kconf.go
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -168,7 +167,7 @@ type Context struct {
 
 func (ctx *Context) generate() error {
 	var err error
-	if ctx.BuildDir, err = ioutil.TempDir("", "syz-kconf"); err != nil {
+	if ctx.BuildDir, err = os.MkdirTemp("", "syz-kconf"); err != nil {
 		return err
 	}
 	defer os.RemoveAll(ctx.BuildDir)
@@ -460,7 +459,7 @@ func (ctx *Context) replaceVars(str string) string {
 }
 
 func releaseTag(dir string) (string, error) {
-	data, err := ioutil.ReadFile(filepath.Join(dir, "Makefile"))
+	data, err := os.ReadFile(filepath.Join(dir, "Makefile"))
 	if err != nil {
 		return "", err
 	}
diff --git a/tools/syz-kconf/parser.go b/tools/syz-kconf/parser.go
index b2ac82e74..05531a227 100644
--- a/tools/syz-kconf/parser.go
+++ b/tools/syz-kconf/parser.go
@@ -6,7 +6,7 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -89,7 +89,7 @@ type rawFile struct {
 }
 
 func parseMainSpec(file string) ([]*Instance, []string, error) {
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to read config file: %v", err)
 	}
@@ -159,7 +159,7 @@ func parseInstance(name, configDir string, features []string, includes []map[str
 }
 
 func parseFile(file string) (*rawFile, error) {
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read %v: %v", file, err)
 	}
diff --git a/tools/syz-mutate/mutate.go b/tools/syz-mutate/mutate.go
index 032d31614..5c97f92e9 100644
--- a/tools/syz-mutate/mutate.go
+++ b/tools/syz-mutate/mutate.go
@@ -7,7 +7,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"runtime"
@@ -72,7 +71,7 @@ func main() {
 	if flag.NArg() == 0 {
 		p = target.Generate(rs, *flagLen, ct)
 	} else {
-		data, err := ioutil.ReadFile(flag.Arg(0))
+		data, err := os.ReadFile(flag.Arg(0))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed to read prog file: %v\n", err)
 			os.Exit(1)
diff --git a/tools/syz-prog2c/prog2c.go b/tools/syz-prog2c/prog2c.go
index 1fd5a6218..e59c941a6 100644
--- a/tools/syz-prog2c/prog2c.go
+++ b/tools/syz-prog2c/prog2c.go
@@ -6,7 +6,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"runtime"
@@ -56,7 +55,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	data, err := ioutil.ReadFile(*flagProg)
+	data, err := os.ReadFile(*flagProg)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to read prog file: %v\n", err)
 		os.Exit(1)
diff --git a/tools/syz-reporter/reporter.go b/tools/syz-reporter/reporter.go
index e0d88c1a6..f9d482c6b 100644
--- a/tools/syz-reporter/reporter.go
+++ b/tools/syz-reporter/reporter.go
@@ -15,7 +15,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -140,7 +139,7 @@ func readCrash(workdir, dir string) *UICrashType {
 		return nil
 	}
 	defer descFile.Close()
-	descBytes, err := ioutil.ReadAll(descFile)
+	descBytes, err := io.ReadAll(descFile)
 	if err != nil || len(descBytes) == 0 {
 		return nil
 	}
@@ -168,7 +167,7 @@ func readCrash(workdir, dir string) *UICrashType {
 		}
 
 		if strings.HasPrefix(f, "tag") {
-			tag, err := ioutil.ReadFile(filepath.Join(crashdir, dir, f))
+			tag, err := os.ReadFile(filepath.Join(crashdir, dir, f))
 			if err == nil {
 				reproducers[string(tag)] = string(tag)
 			}
@@ -179,19 +178,19 @@ func readCrash(workdir, dir string) *UICrashType {
 		}
 
 		if f == "cause.commit" {
-			commits, err := ioutil.ReadFile(filepath.Join(crashdir, dir, f))
+			commits, err := os.ReadFile(filepath.Join(crashdir, dir, f))
 			if err == nil {
 				causingCommits = strings.Split(string(commits), "\n")
 			}
 		}
 		if f == "fix.commit" {
-			commits, err := ioutil.ReadFile(filepath.Join(crashdir, dir, f))
+			commits, err := os.ReadFile(filepath.Join(crashdir, dir, f))
 			if err == nil {
 				fixingCommits = strings.Split(string(commits), "\n")
 			}
 		}
 		if f == kconfig.CauseConfigFile {
-			configs, err := ioutil.ReadFile(filepath.Join(crashdir, dir, f))
+			configs, err := os.ReadFile(filepath.Join(crashdir, dir, f))
 			if err == nil {
 				configsList := strings.Split(string(configs), "\n")
 				// Ignore configuration list longer than 10
diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go
index cc261f3a1..aa4e473c0 100644
--- a/tools/syz-repro/repro.go
+++ b/tools/syz-repro/repro.go
@@ -6,7 +6,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -40,7 +39,7 @@ func main() {
 		log.Fatalf("%v: %v", *flagConfig, err)
 	}
 	logFile := flag.Args()[0]
-	data, err := ioutil.ReadFile(logFile)
+	data, err := os.ReadFile(logFile)
 	if err != nil {
 		log.Fatalf("failed to open log file %v: %v", logFile, err)
 	}
diff --git a/tools/syz-reprolist/reprolist.go b/tools/syz-reprolist/reprolist.go
index 449c1b50b..56313e952 100644
--- a/tools/syz-reprolist/reprolist.go
+++ b/tools/syz-reprolist/reprolist.go
@@ -6,7 +6,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -103,7 +102,7 @@ func writeRepros(bugchan chan *dashapi.BugReport) {
 		if len(bug.ReproSyz) == 0 {
 			log.Printf("%v: %v: no repro", bug.ID, bug.BugStatus)
 			file := filepath.Join(*flagOutputDir, bug.ID+".norepro")
-			if err := ioutil.WriteFile(file, nil, 0644); err != nil {
+			if err := os.WriteFile(file, nil, 0644); err != nil {
 				log.Fatalf("failed to write file: %v", err)
 			}
 			continue
@@ -114,7 +113,7 @@ func writeRepros(bugchan chan *dashapi.BugReport) {
 				log.Print(err)
 				errText := []byte(err.Error())
 				file := filepath.Join(*flagOutputDir, bug.ID+".error")
-				if err := ioutil.WriteFile(file, errText, 0644); err != nil {
+				if err := os.WriteFile(file, errText, 0644); err != nil {
 					log.Fatalf("failed to write file: %v", err)
 				}
 				continue
@@ -129,7 +128,7 @@ func writeRepros(bugchan chan *dashapi.BugReport) {
 			bug.Title, *flagDashboard, bug.ID, bug.BugStatus, arch))
 		repro = append(repro, bug.ReproC...)
 		file := filepath.Join(*flagOutputDir, bug.ID+".c")
-		if err := ioutil.WriteFile(file, repro, 0644); err != nil {
+		if err := os.WriteFile(file, repro, 0644); err != nil {
 			log.Fatalf("failed to write file: %v", err)
 		}
 	}
@@ -141,7 +140,7 @@ func createCRepro(bug *dashapi.BugReport) error {
 		return fmt.Errorf("failed to deserialize opts: %v", err)
 	}
 	file := filepath.Join(*flagOutputDir, bug.ID+".syz")
-	if err := ioutil.WriteFile(file, bug.ReproSyz, 0644); err != nil {
+	if err := os.WriteFile(file, bug.ReproSyz, 0644); err != nil {
 		return fmt.Errorf("failed to write file: %v", err)
 	}
 	repo := vcs.NewSyzkallerRepo(*flagSyzkallerDir, vcs.OptPrecious)
diff --git a/tools/syz-runtest/runtest.go b/tools/syz-runtest/runtest.go
index 3bf05c8b0..c36936056 100644
--- a/tools/syz-runtest/runtest.go
+++ b/tools/syz-runtest/runtest.go
@@ -10,7 +10,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net"
 	"os"
@@ -258,7 +257,7 @@ func (mgr *Manager) Poll(a *rpctype.RunTestPollReq, r *rpctype.RunTestPollRes) e
 	mgr.lastReq[a.Name] = mgr.reqSeq
 	mgr.reqMu.Unlock()
 	if req.Bin != "" {
-		data, err := ioutil.ReadFile(req.Bin)
+		data, err := os.ReadFile(req.Bin)
 		if err != nil {
 			log.Fatalf("failed to read bin file: %v", err)
 		}
diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go
index bf8e94caa..19bf93a70 100644
--- a/tools/syz-symbolize/symbolize.go
+++ b/tools/syz-symbolize/symbolize.go
@@ -6,7 +6,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -47,7 +46,7 @@ func main() {
 	if err != nil {
 		tool.Failf("failed to create reporter: %v", err)
 	}
-	text, err := ioutil.ReadFile(flag.Args()[0])
+	text, err := os.ReadFile(flag.Args()[0])
 	if err != nil {
 		tool.Failf("failed to open input file: %v", err)
 	}
diff --git a/tools/syz-testbed/html.go b/tools/syz-testbed/html.go
index 060914407..70e20ac0b 100644
--- a/tools/syz-testbed/html.go
+++ b/tools/syz-testbed/html.go
@@ -8,7 +8,6 @@ import (
 	"embed"
 	"fmt"
 	"html/template"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -93,7 +92,7 @@ func (ctx *TestbedContext) httpGraph(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// TODO: move syz-benchcmp functionality to pkg/ and just import it?
-	dir, err := ioutil.TempDir("", "")
+	dir, err := os.MkdirTemp("", "")
 	if err != nil {
 		http.Error(w, "failed to create temp folder", http.StatusInternalServerError)
 		return
@@ -119,7 +118,7 @@ func (ctx *TestbedContext) httpGraph(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		http.Error(w, "failed to read the temporary file", http.StatusInternalServerError)
 		return
diff --git a/tools/syz-testbed/instance.go b/tools/syz-testbed/instance.go
index 5c7718c4f..a7b616eb6 100644
--- a/tools/syz-testbed/instance.go
+++ b/tools/syz-testbed/instance.go
@@ -5,7 +5,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -206,7 +205,7 @@ func (inst *SyzReproInstance) FetchResult() (RunResult, error) {
 		CReproFound: osutil.IsExist(inst.CReproFile),
 		Duration:    inst.Uptime(),
 	}
-	outTitle, _ := ioutil.ReadFile(inst.TitleFile)
+	outTitle, _ := os.ReadFile(inst.TitleFile)
 	if outTitle != nil {
 		result.ReproTitle = strings.TrimSpace(string(outTitle))
 		if result.ReproTitle != inst.Input.origTitle {
diff --git a/tools/syz-testbed/stats.go b/tools/syz-testbed/stats.go
index 9af33f4e7..1f6bb4443 100644
--- a/tools/syz-testbed/stats.go
+++ b/tools/syz-testbed/stats.go
@@ -6,7 +6,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -64,14 +63,14 @@ func collectBugs(workdir string) ([]BugInfo, error) {
 	bugs := []BugInfo{}
 	for _, dir := range dirs {
 		bugFolder := filepath.Join(crashdir, dir)
-		titleBytes, err := ioutil.ReadFile(filepath.Join(bugFolder, "description"))
+		titleBytes, err := os.ReadFile(filepath.Join(bugFolder, "description"))
 		if err != nil {
 			return nil, err
 		}
 		bug := BugInfo{
 			Title: strings.TrimSpace(string(titleBytes)),
 		}
-		files, err := ioutil.ReadDir(bugFolder)
+		files, err := os.ReadDir(bugFolder)
 		if err != nil {
 			return nil, err
 		}
diff --git a/tools/syz-testbed/targets.go b/tools/syz-testbed/targets.go
index 788561bb3..67a359b62 100644
--- a/tools/syz-testbed/targets.go
+++ b/tools/syz-testbed/targets.go
@@ -5,7 +5,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/rand"
 	"os"
@@ -173,7 +172,7 @@ type SyzReproInput struct {
 }
 
 func (inp *SyzReproInput) QueryTitle(checkout *Checkout, dupsMap map[string]int) error {
-	data, err := ioutil.ReadFile(inp.Path)
+	data, err := os.ReadFile(inp.Path)
 	if err != nil {
 		return fmt.Errorf("failed to read: %s", err)
 	}
diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go
index 55d980818..dac89bfcc 100644
--- a/tools/syz-testbuild/testbuild.go
+++ b/tools/syz-testbuild/testbuild.go
@@ -25,7 +25,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"runtime"
@@ -63,7 +62,7 @@ func main() {
 		tool.Failf("image build will fail, run under root")
 	}
 	os.Setenv("SYZ_DISABLE_SANDBOXING", "yes")
-	dir, err := ioutil.TempDir("", "syz-testbuild")
+	dir, err := os.MkdirTemp("", "syz-testbuild")
 	if err != nil {
 		tool.Fail(err)
 	}
@@ -106,7 +105,7 @@ func main() {
 		tool.Fail(err)
 	}
 	log.Printf("tags: %v", tags)
-	kernelConfig, err := ioutil.ReadFile(*flagKernelConfig)
+	kernelConfig, err := os.ReadFile(*flagKernelConfig)
 	if err != nil {
 		tool.Fail(err)
 	}
diff --git a/tools/syz-upgrade/upgrade.go b/tools/syz-upgrade/upgrade.go
index 795d52c44..93d2dc881 100644
--- a/tools/syz-upgrade/upgrade.go
+++ b/tools/syz-upgrade/upgrade.go
@@ -12,7 +12,6 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -26,7 +25,7 @@ func main() {
 	if len(os.Args) != 2 {
 		fatalf("usage: syz-upgrade corpus_dir")
 	}
-	files, err := ioutil.ReadDir(os.Args[1])
+	files, err := os.ReadDir(os.Args[1])
 	if err != nil {
 		fatalf("failed to read corpus dir: %v", err)
 	}
@@ -36,7 +35,7 @@ func main() {
 	}
 	for _, f := range files {
 		fname := filepath.Join(os.Args[1], f.Name())
-		data, err := ioutil.ReadFile(fname)
+		data, err := os.ReadFile(fname)
 		if err != nil {
 			fatalf("failed to read program: %v", err)
 		}
diff --git a/tools/syz-usbgen/usbgen.go b/tools/syz-usbgen/usbgen.go
index d2ddc3462..e77ff7a59 100644
--- a/tools/syz-usbgen/usbgen.go
+++ b/tools/syz-usbgen/usbgen.go
@@ -7,7 +7,6 @@ import (
 	"encoding/hex"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"sort"
@@ -23,7 +22,7 @@ func main() {
 		usage()
 	}
 
-	syslog, err := ioutil.ReadFile(args[0])
+	syslog, err := os.ReadFile(args[0])
 	if err != nil {
 		tool.Failf("failed to read file %v: %v", args[0], err)
 	}