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

4 files changed, 6 insertions, 10 deletions

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)
 	}