diff options
| author | Taras Madan <tarasmadan@google.com> | 2023-07-21 11:54:11 +0200 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2023-07-24 09:12:13 +0000 |
| commit | 7549a7e1b57831cf6b08ce4700fc6e53417919f9 (patch) | |
| tree | 8e027cdaf7abbc52a5fb29c37c7137dfd2122e7a /pkg/osutil | |
| parent | f7eecac8b446ef11cff4122de6f496ad5eaba3a9 (diff) | |
all: use special placeholder for errors
Diffstat (limited to 'pkg/osutil')
| -rw-r--r-- | pkg/osutil/fileutil.go | 4 | ||||
| -rw-r--r-- | pkg/osutil/fileutil_test.go | 2 | ||||
| -rw-r--r-- | pkg/osutil/osutil.go | 10 | ||||
| -rw-r--r-- | pkg/osutil/osutil_unix.go | 6 | ||||
| -rw-r--r-- | pkg/osutil/sharedmem_memfd.go | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/pkg/osutil/fileutil.go b/pkg/osutil/fileutil.go index 966560649..850335cfe 100644 --- a/pkg/osutil/fileutil.go +++ b/pkg/osutil/fileutil.go @@ -55,12 +55,12 @@ func WriteTempFile(data []byte) (string, error) { // Note: pkg/report knows about "syzkaller" prefix as it appears in crashes as process name. f, err := os.CreateTemp("", "syzkaller") if err != nil { - return "", fmt.Errorf("failed to create a temp file: %v", err) + return "", fmt.Errorf("failed to create a temp file: %w", err) } if _, err := f.Write(data); err != nil { f.Close() os.Remove(f.Name()) - return "", fmt.Errorf("failed to write a temp file: %v", err) + return "", fmt.Errorf("failed to write a temp file: %w", err) } f.Close() return f.Name(), nil diff --git a/pkg/osutil/fileutil_test.go b/pkg/osutil/fileutil_test.go index 20d02ea22..33a450fda 100644 --- a/pkg/osutil/fileutil_test.go +++ b/pkg/osutil/fileutil_test.go @@ -38,7 +38,7 @@ func TestProcessTempDir(t *testing.T) { go func() { dir, err := ProcessTempDir(tmp) if err != nil { - done <- fmt.Errorf("failed to create temp dir: %v", err) + done <- fmt.Errorf("failed to create temp dir: %w", err) return } mu.Lock() diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index ba1fb8729..1687cef9d 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -43,7 +43,7 @@ func Run(timeout time.Duration, cmd *exec.Cmd) ([]byte, error) { } setPdeathsig(cmd, true) if err := cmd.Start(); err != nil { - return nil, fmt.Errorf("failed to start %v %+v: %v", cmd.Path, cmd.Args, err) + return nil, fmt.Errorf("failed to start %v %+v: %w", cmd.Path, cmd.Args, err) } done := make(chan bool) timedout := make(chan bool, 1) @@ -125,7 +125,7 @@ func PrependContext(ctx string, err error) error { err1.Title = fmt.Sprintf("%v: %v", ctx, err1.Title) return err1 default: - return fmt.Errorf("%v: %v", ctx, err) + return fmt.Errorf("%v: %w", ctx, err) } } @@ -147,7 +147,7 @@ func IsAccessible(name string) error { } f, err := os.Open(name) if err != nil { - return fmt.Errorf("%v can't be opened (%v)", name, err) + return fmt.Errorf("%v can't be opened (%w)", name, err) } f.Close() return nil @@ -157,7 +157,7 @@ func IsAccessible(name string) error { func IsWritable(name string) error { f, err := os.OpenFile(name, os.O_WRONLY, DefaultFilePerm) if err != nil { - return fmt.Errorf("%v can't be written (%v)", name, err) + return fmt.Errorf("%v can't be written (%w)", name, err) } f.Close() return nil @@ -297,7 +297,7 @@ func WriteExecFile(filename string, data []byte) error { func TempFile(prefix string) (string, error) { f, err := os.CreateTemp("", prefix) if err != nil { - return "", fmt.Errorf("failed to create temp file: %v", err) + return "", fmt.Errorf("failed to create temp file: %w", err) } f.Close() return f.Name(), nil diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go index 5563fb5fd..cf6b0284e 100644 --- a/pkg/osutil/osutil_unix.go +++ b/pkg/osutil/osutil_unix.go @@ -89,7 +89,7 @@ func HandleInterrupts(shutdown chan struct{}) { func LongPipe() (io.ReadCloser, io.WriteCloser, error) { r, w, err := os.Pipe() if err != nil { - return nil, nil, fmt.Errorf("failed to create pipe: %v", err) + return nil, nil, fmt.Errorf("failed to create pipe: %w", err) } prolongPipe(r, w) return r, w, err @@ -108,14 +108,14 @@ func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) { return } if err = f.Truncate(int64(size)); err != nil { - err = fmt.Errorf("failed to truncate shared mem file: %v", err) + err = fmt.Errorf("failed to truncate shared mem file: %w", err) CloseSharedMemFile(f) return } mem, err = syscall.Mmap(int(f.Fd()), 0, size, syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_SHARED) if err != nil { - err = fmt.Errorf("failed to mmap shm file: %v", err) + err = fmt.Errorf("failed to mmap shm file: %w", err) CloseSharedMemFile(f) } return diff --git a/pkg/osutil/sharedmem_memfd.go b/pkg/osutil/sharedmem_memfd.go index 9eb3a4075..213080e49 100644 --- a/pkg/osutil/sharedmem_memfd.go +++ b/pkg/osutil/sharedmem_memfd.go @@ -18,7 +18,7 @@ func CreateSharedMemFile(size int) (f *os.File, err error) { // The name is actually irrelevant and can even be the same for all such files. fd, err := unix.MemfdCreate("syz-shared-mem", unix.MFD_CLOEXEC) if err != nil { - err = fmt.Errorf("failed to do memfd_create: %v", err) + err = fmt.Errorf("failed to do memfd_create: %w", err) return } f = os.NewFile(uintptr(fd), fmt.Sprintf("/proc/self/fd/%d", fd)) |
