all: use special placeholder for errors

5 files changed, 12 insertions, 12 deletions

diff --git a/tools/syz-testbed/checkout.go b/tools/syz-testbed/checkout.go
index e28786930..eb7481bef 100644
--- a/tools/syz-testbed/checkout.go
+++ b/tools/syz-testbed/checkout.go
@@ -101,12 +101,12 @@ func (ctx *TestbedContext) NewCheckout(config *CheckoutConfig, mgrConfig json.Ra
 	repo := vcs.NewSyzkallerRepo(checkout.Path)
 	commit, err := repo.Poll(config.Repo, config.Branch)
 	if err != nil {
-		return nil, fmt.Errorf("failed to checkout %s (%s): %s", config.Repo, config.Branch, err)
+		return nil, fmt.Errorf("failed to checkout %s (%s): %w", config.Repo, config.Branch, err)
 	}
 	log.Printf("[%s] Done. Latest commit: %s", checkout.Name, commit)
 	log.Printf("[%s] Building", checkout.Name)
 	if _, err := osutil.RunCmd(time.Hour, checkout.Path, syz_instance.MakeBin); err != nil {
-		return nil, fmt.Errorf("[%s] Make failed: %s", checkout.Name, err)
+		return nil, fmt.Errorf("[%s] Make failed: %w", checkout.Name, err)
 	}
 	return checkout, nil
 }
diff --git a/tools/syz-testbed/html.go b/tools/syz-testbed/html.go
index 70e20ac0b..679099a8a 100644
--- a/tools/syz-testbed/html.go
+++ b/tools/syz-testbed/html.go
@@ -192,7 +192,7 @@ func (ctx *TestbedContext) genSimpleTableController(method func(view StatView) (
 	return func(urlPrefix string, view StatView, r *http.Request) (*uiTable, error) {
 		table, err := method(view)
 		if err != nil {
-			return nil, fmt.Errorf("table generation failed: %s", err)
+			return nil, fmt.Errorf("table generation failed: %w", err)
 		}
 		return &uiTable{
 			Table:     table,
@@ -208,7 +208,7 @@ func (ctx *TestbedContext) httpMainStatsTable(urlPrefix string, view StatView, r
 	}
 	table, err := view.AlignedStatsTable(alignBy)
 	if err != nil {
-		return nil, fmt.Errorf("stat table generation failed: %s", err)
+		return nil, fmt.Errorf("stat table generation failed: %w", err)
 	}
 	baseColumn := r.FormValue("base_column")
 	if baseColumn != "" {
diff --git a/tools/syz-testbed/instance.go b/tools/syz-testbed/instance.go
index a7b616eb6..2ea3161e3 100644
--- a/tools/syz-testbed/instance.go
+++ b/tools/syz-testbed/instance.go
@@ -42,7 +42,7 @@ func (inst *InstanceCommon) Run() error {
 	if inst.LogFile != "" {
 		logfile, err := os.Create(inst.LogFile)
 		if err != nil {
-			return fmt.Errorf("[%s] failed to create logfile: %s", inst.Name, err)
+			return fmt.Errorf("[%s] failed to create logfile: %w", inst.Name, err)
 		}
 		cmd.Stdout = logfile
 		cmd.Stderr = logfile
@@ -120,7 +120,7 @@ func (inst *SyzManagerInstance) Run() error {
 	case err := <-ret:
 		// Syz-managers are not supposed to stop themselves under normal circumstances.
 		// If one of them did stop, there must have been a very good reason to do so.
-		return fmt.Errorf("[%s] stopped: %v", inst.Name, err)
+		return fmt.Errorf("[%s] stopped: %w", inst.Name, err)
 	case <-time.After(inst.RunTime):
 		inst.Stop()
 		<-ret
@@ -153,7 +153,7 @@ func SetupSyzkallerInstance(mgrName, folder string, checkout *Checkout) (*Syzkal
 	}
 	err = osutil.WriteFile(cfgFile, managerCfg)
 	if err != nil {
-		return nil, fmt.Errorf("failed to save manager config to %s: %s", cfgFile, err)
+		return nil, fmt.Errorf("failed to save manager config to %s: %w", cfgFile, err)
 	}
 	return &SyzkallerInfo{
 		Workdir:   workdir,
@@ -173,7 +173,7 @@ func (t *SyzManagerTarget) newSyzManagerInstance(slotName, uniqName string, chec
 		corpusPath := filepath.Join(common.Workdir, "corpus.db")
 		err = osutil.CopyFile(t.config.Corpus, corpusPath)
 		if err != nil {
-			return nil, fmt.Errorf("failed to copy corpus from %s: %s", t.config.Corpus, err)
+			return nil, fmt.Errorf("failed to copy corpus from %s: %w", t.config.Corpus, err)
 		}
 	}
 	return &SyzManagerInstance{
diff --git a/tools/syz-testbed/targets.go b/tools/syz-testbed/targets.go
index 67a359b62..ef0b189a4 100644
--- a/tools/syz-testbed/targets.go
+++ b/tools/syz-testbed/targets.go
@@ -133,7 +133,7 @@ func (t *SyzManagerTarget) SaveStatView(view StatView, dir string) error {
 	benchDir := filepath.Join(dir, "benches")
 	err := osutil.MkdirAll(benchDir)
 	if err != nil {
-		return fmt.Errorf("failed to create %s: %s", benchDir, err)
+		return fmt.Errorf("failed to create %s: %w", benchDir, err)
 	}
 	tableStats := map[string]func(view StatView) (*Table, error){
 		"bugs.csv":           (StatView).GenerateBugTable,
@@ -174,7 +174,7 @@ type SyzReproInput struct {
 func (inp *SyzReproInput) QueryTitle(checkout *Checkout, dupsMap map[string]int) error {
 	data, err := os.ReadFile(inp.Path)
 	if err != nil {
-		return fmt.Errorf("failed to read: %s", err)
+		return fmt.Errorf("failed to read: %w", err)
 	}
 	report := checkout.GetReporter().Parse(data)
 	if report == nil {
diff --git a/tools/syz-testbed/testbed.go b/tools/syz-testbed/testbed.go
index d47ee9e53..2c104ebc3 100644
--- a/tools/syz-testbed/testbed.go
+++ b/tools/syz-testbed/testbed.go
@@ -205,7 +205,7 @@ func (ctx *TestbedContext) Slot(slotID int, stop chan struct{}, ret chan error)
 	for {
 		checkout, instance, err := ctx.Target.NewJob(slotName, ctx.Checkouts)
 		if err != nil {
-			ret <- fmt.Errorf("failed to create instance: %s", err)
+			ret <- fmt.Errorf("failed to create instance: %w", err)
 			return
 		}
 		checkout.AddRunning(instance)
@@ -232,7 +232,7 @@ func (ctx *TestbedContext) Slot(slotID int, stop chan struct{}, ret chan error)
 		}
 		err = checkout.ArchiveInstance(instance)
 		if err != nil {
-			ret <- fmt.Errorf("a call to ArchiveInstance failed: %s", err)
+			ret <- fmt.Errorf("a call to ArchiveInstance failed: %w", err)
 			return
 		}
 	}