aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2025-02-06 10:29:46 +0100
committerAleksandr Nogikh <nogikh@google.com>2025-02-10 11:56:20 +0000
commit43f51a00700e5960fc890e6c3d596846757bf29d (patch)
treedee3d11120b60aa848b1f1d73d5066c8d5dd9c7c
parent529cb927961356394978d77470022859e718c44a (diff)
all: delete dead code
go install golang.org/x/tools/cmd/deadcode@latest deadcode -test ./...
-rw-r--r--pkg/covermerger/provider_web.go9
-rw-r--r--pkg/flatrpc/helpers.go13
-rw-r--r--pkg/hash/hash.go13
-rw-r--r--pkg/html/html.go5
-rw-r--r--pkg/instance/execprog.go4
-rw-r--r--pkg/log/log.go9
-rw-r--r--pkg/manager/report_generator.go9
-rw-r--r--pkg/osutil/osutil.go23
-rw-r--r--pkg/osutil/osutil_fuchsia.go9
-rw-r--r--pkg/osutil/osutil_unix.go40
-rw-r--r--pkg/osutil/osutil_windows.go9
-rw-r--r--pkg/osutil/sharedmem_file.go41
-rw-r--r--pkg/osutil/sharedmem_memfd.go29
-rw-r--r--pkg/rpctype/rpc.go4
-rw-r--r--pkg/vcs/git_test_util.go19
-rw-r--r--pkg/vcs/vcs.go4
-rw-r--r--prog/encoding.go4
-rw-r--r--prog/prog.go5
18 files changed, 0 insertions, 249 deletions
diff --git a/pkg/covermerger/provider_web.go b/pkg/covermerger/provider_web.go
index 554ee3f97..e172d47e9 100644
--- a/pkg/covermerger/provider_web.go
+++ b/pkg/covermerger/provider_web.go
@@ -76,12 +76,3 @@ func MakeWebGit(funcProxy FuncProxyURI) FileVersProvider {
funcProxy: funcProxy,
}
}
-
-func GetFileVersion(filePath, repo, commit string) (string, error) {
- repoCommit := RepoCommit{repo, commit}
- files, err := MakeWebGit(nil).GetFileVersions(filePath, repoCommit)
- if err != nil {
- return "", fmt.Errorf("failed to GetFileVersions: %w", err)
- }
- return files[repoCommit], nil
-}
diff --git a/pkg/flatrpc/helpers.go b/pkg/flatrpc/helpers.go
index 5fb86e44a..9a5463b24 100644
--- a/pkg/flatrpc/helpers.go
+++ b/pkg/flatrpc/helpers.go
@@ -100,19 +100,6 @@ func SandboxToFlags(sandbox string) (ExecEnv, error) {
}
}
-func FlagsToSandbox(flags ExecEnv) string {
- if flags&ExecEnvSandboxNone != 0 {
- return "none"
- } else if flags&ExecEnvSandboxSetuid != 0 {
- return "setuid"
- } else if flags&ExecEnvSandboxNamespace != 0 {
- return "namespace"
- } else if flags&ExecEnvSandboxAndroid != 0 {
- return "android"
- }
- panic("no sandbox flags present")
-}
-
func (hdr *SnapshotHeaderT) UpdateState(state SnapshotState) {
atomic.StoreUint64((*uint64)(unsafe.Pointer(&hdr.State)), uint64(state))
}
diff --git a/pkg/hash/hash.go b/pkg/hash/hash.go
index 5b325fa34..350d3a3e8 100644
--- a/pkg/hash/hash.go
+++ b/pkg/hash/hash.go
@@ -40,16 +40,3 @@ func (sig *Sig) Truncate64() int64 {
}
return v
}
-
-func FromString(str string) (Sig, error) {
- bin, err := hex.DecodeString(str)
- if err != nil {
- return Sig{}, fmt.Errorf("failed to decode sig '%v': %w", str, err)
- }
- if len(bin) != len(Sig{}) {
- return Sig{}, fmt.Errorf("failed to decode sig '%v': bad len", str)
- }
- var sig Sig
- copy(sig[:], bin[:])
- return sig, err
-}
diff --git a/pkg/html/html.go b/pkg/html/html.go
index 5429606e2..4893b8377 100644
--- a/pkg/html/html.go
+++ b/pkg/html/html.go
@@ -30,11 +30,6 @@ var globSearchPath = func() string {
return "templates/"
}()
-// SetGlobSearchPath overrides the default path where syzkaller looks for templates.
-func SetGlobSearchPath(path string) {
- globSearchPath = path
-}
-
func CreateGlob(glob string) *template.Template {
if strings.Contains(glob, string(filepath.Separator)) {
panic("glob can't be a path, the files mask is expected")
diff --git a/pkg/instance/execprog.go b/pkg/instance/execprog.go
index d8aaa5a7e..4fd656fc5 100644
--- a/pkg/instance/execprog.go
+++ b/pkg/instance/execprog.go
@@ -206,7 +206,3 @@ func (inst *ExecProgInstance) RunSyzProg(params ExecParams) (*RunResult, error)
}
return inst.RunSyzProgFile(progFile, params.Duration, params.Opts, params.ExitConditions)
}
-
-func (inst *ExecProgInstance) Close() {
- inst.VMInstance.Close()
-}
diff --git a/pkg/log/log.go b/pkg/log/log.go
index bcb4dbda8..19ff6fd9b 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -99,15 +99,6 @@ func Fatalf(msg string, args ...interface{}) {
golog.Fatal(message("FATAL", msg, args...))
}
-// SyzFatalf-reported errors are parsed by syzkaller as if they were kernel bugs.
-func SyzFatalf(msg string, args ...interface{}) {
- golog.Fatalf("SYZFATAL: "+msg, args...)
-}
-
-func SyzFatal(err error) {
- SyzFatalf("%v", err)
-}
-
func message(severity, msg string, args ...interface{}) string {
var sb strings.Builder
if severity != "" {
diff --git a/pkg/manager/report_generator.go b/pkg/manager/report_generator.go
index 6dcdbf0a3..b3d293ef1 100644
--- a/pkg/manager/report_generator.go
+++ b/pkg/manager/report_generator.go
@@ -68,12 +68,3 @@ func CoverToPCs(cfg *mgrconfig.Config, cov []uint64) []uint64 {
}
return pcs
}
-
-func PCsToCover(cfg *mgrconfig.Config, pcs map[uint64]struct{}) map[uint64]struct{} {
- ret := make(map[uint64]struct{})
- for pc := range pcs {
- next := backend.NextInstructionPC(cfg.SysTarget, cfg.Type, pc)
- ret[next] = struct{}{}
- }
- return ret
-}
diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go
index c9ee98412..8e0ed7ea3 100644
--- a/pkg/osutil/osutil.go
+++ b/pkg/osutil/osutil.go
@@ -145,29 +145,6 @@ func IsExist(name string) bool {
return err == nil
}
-// IsAccessible checks if the file can be opened.
-func IsAccessible(name string) error {
- if !IsExist(name) {
- return fmt.Errorf("%v does not exist", name)
- }
- f, err := os.Open(name)
- if err != nil {
- return fmt.Errorf("%v can't be opened (%w)", name, err)
- }
- f.Close()
- return nil
-}
-
-// IsWritable checks if the file can be written.
-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 (%w)", name, err)
- }
- f.Close()
- return nil
-}
-
// FilesExist returns true if all files exist in dir.
// Files are assumed to be relative names in slash notation.
func FilesExist(dir string, files map[string]bool) bool {
diff --git a/pkg/osutil/osutil_fuchsia.go b/pkg/osutil/osutil_fuchsia.go
index 1ebd64eb4..fce4e38ba 100644
--- a/pkg/osutil/osutil_fuchsia.go
+++ b/pkg/osutil/osutil_fuchsia.go
@@ -6,7 +6,6 @@
package osutil
import (
- "fmt"
"os"
"os/exec"
"time"
@@ -27,14 +26,6 @@ func SystemMemorySize() uint64 {
return 0
}
-func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) {
- return nil, nil, fmt.Errorf("CreateMemMappedFile is not implemented")
-}
-
-func CloseMemMappedFile(f *os.File, mem []byte) error {
- return fmt.Errorf("CloseMemMappedFile is not implemented")
-}
-
func ProcessExitStatus(ps *os.ProcessState) int {
// TODO: can be extracted from ExitStatus string.
return 0
diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go
index 7243a7014..91a713236 100644
--- a/pkg/osutil/osutil_unix.go
+++ b/pkg/osutil/osutil_unix.go
@@ -93,43 +93,3 @@ func LongPipe() (io.ReadCloser, io.WriteCloser, error) {
prolongPipe(r, w)
return r, w, err
}
-
-// ProcessExitStatus returns process exit status.
-// This is here only because of fuchsia that does not implement WaitStatus.
-func ProcessExitStatus(ps *os.ProcessState) int {
- return ps.Sys().(syscall.WaitStatus).ExitStatus()
-}
-
-// CreateMemMappedFile creates a temp file with the requested size and maps it into memory.
-func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) {
- f, err = CreateSharedMemFile(size)
- if err != nil {
- return
- }
- if err = f.Truncate(int64(size)); err != nil {
- 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: %w", err)
- CloseSharedMemFile(f)
- }
- return
-}
-
-// CloseMemMappedFile destroys memory mapping created by CreateMemMappedFile.
-func CloseMemMappedFile(f *os.File, mem []byte) error {
- err1 := syscall.Munmap(mem)
- err2 := CloseSharedMemFile(f)
- switch {
- case err1 != nil:
- return err1
- case err2 != nil:
- return err2
- default:
- return nil
- }
-}
diff --git a/pkg/osutil/osutil_windows.go b/pkg/osutil/osutil_windows.go
index c5763b677..03e729e83 100644
--- a/pkg/osutil/osutil_windows.go
+++ b/pkg/osutil/osutil_windows.go
@@ -4,7 +4,6 @@
package osutil
import (
- "fmt"
"os"
"os/exec"
"syscall"
@@ -29,14 +28,6 @@ func SystemMemorySize() uint64 {
func prolongPipe(r, w *os.File) {
}
-func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) {
- return nil, nil, fmt.Errorf("CreateMemMappedFile is not implemented")
-}
-
-func CloseMemMappedFile(f *os.File, mem []byte) error {
- return fmt.Errorf("CloseMemMappedFile is not implemented")
-}
-
func ProcessExitStatus(ps *os.ProcessState) int {
return ps.Sys().(syscall.WaitStatus).ExitStatus()
}
diff --git a/pkg/osutil/sharedmem_file.go b/pkg/osutil/sharedmem_file.go
deleted file mode 100644
index 0d899fab5..000000000
--- a/pkg/osutil/sharedmem_file.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 syzkaller project authors. All rights reserved.
-// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-//go:build freebsd || netbsd || openbsd || darwin
-
-package osutil
-
-import (
- "fmt"
- "io/ioutil"
- "os"
-)
-
-func CreateSharedMemFile(size int) (f *os.File, err error) {
- f, err = ioutil.TempFile("./", "syzkaller-shm")
- if err != nil {
- err = fmt.Errorf("failed to create temp file: %v", err)
- return
- }
- f.Close()
- fname := f.Name()
- f, err = os.OpenFile(f.Name(), os.O_RDWR, DefaultFilePerm)
- if err != nil {
- err = fmt.Errorf("failed to open shm file: %v", err)
- os.Remove(fname)
- }
- return
-}
-
-func CloseSharedMemFile(f *os.File) error {
- err1 := f.Close()
- err2 := os.Remove(f.Name())
- switch {
- case err1 != nil:
- return err1
- case err2 != nil:
- return err2
- default:
- return nil
- }
-}
diff --git a/pkg/osutil/sharedmem_memfd.go b/pkg/osutil/sharedmem_memfd.go
deleted file mode 100644
index 84077b9ec..000000000
--- a/pkg/osutil/sharedmem_memfd.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2021 syzkaller project authors. All rights reserved.
-// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-//go:build linux
-
-package osutil
-
-import (
- "fmt"
- "os"
-
- "golang.org/x/sys/unix"
-)
-
-// In the case of Linux, we can just use the memfd_create syscall.
-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: %w", err)
- return
- }
- f = os.NewFile(uintptr(fd), fmt.Sprintf("/proc/self/fd/%d", fd))
- return
-}
-
-func CloseSharedMemFile(f *os.File) error {
- return f.Close()
-}
diff --git a/pkg/rpctype/rpc.go b/pkg/rpctype/rpc.go
index 7bb0fe570..f3a05eeae 100644
--- a/pkg/rpctype/rpc.go
+++ b/pkg/rpctype/rpc.go
@@ -76,10 +76,6 @@ func (cli *RPCClient) Call(method string, args, reply interface{}) error {
return cli.c.Call(method, args, reply)
}
-func (cli *RPCClient) AsyncCall(method string, args interface{}) {
- cli.c.Go(method, args, nil, nil)
-}
-
func (cli *RPCClient) Close() {
cli.c.Close()
}
diff --git a/pkg/vcs/git_test_util.go b/pkg/vcs/git_test_util.go
index 0595dc533..9d5ef1edc 100644
--- a/pkg/vcs/git_test_util.go
+++ b/pkg/vcs/git_test_util.go
@@ -110,22 +110,3 @@ func CreateTestRepo(t *testing.T, baseDir, name string) *TestRepo {
repo.CommitFileChange("master", "1")
return repo
}
-
-func CloneTestRepo(t *testing.T, baseDir, name string, originRepo *TestRepo) *TestRepo {
- dir := filepath.Join(baseDir, name)
- if err := osutil.MkdirAll(dir); err != nil {
- t.Fatal(err)
- }
- ignoreCC := map[string]bool{
- "stable@vger.kernel.org": true,
- }
- repo := &TestRepo{
- t: t,
- Dir: dir,
- name: filepath.Base(dir),
- Commits: make(map[string]map[string]*Commit),
- repo: newGitRepo(dir, ignoreCC, []RepoOpt{OptPrecious, OptDontSandbox}),
- }
- repo.Git("clone", originRepo.Dir, repo.Dir)
- return repo
-}
diff --git a/pkg/vcs/vcs.go b/pkg/vcs/vcs.go
index b0a2dc8eb..c9a440ed1 100644
--- a/pkg/vcs/vcs.go
+++ b/pkg/vcs/vcs.go
@@ -362,10 +362,6 @@ func CommitLink(url, hash string) string {
return link(url, hash, "", 0, 0)
}
-func TreeLink(url, hash string) string {
- return link(url, hash, "", 0, 1)
-}
-
func LogLink(url, hash string) string {
return link(url, hash, "", 0, 2)
}
diff --git a/prog/encoding.go b/prog/encoding.go
index 41a03d9fd..5d2750630 100644
--- a/prog/encoding.go
+++ b/prog/encoding.go
@@ -1185,10 +1185,6 @@ func (p *parser) Err() error {
return p.e
}
-func (p *parser) Str() string {
- return p.s
-}
-
func (p *parser) EOF() bool {
return p.i == len(p.s)
}
diff --git a/prog/prog.go b/prog/prog.go
index 27b46c541..89b0e794b 100644
--- a/prog/prog.go
+++ b/prog/prog.go
@@ -475,11 +475,6 @@ func removeArg(arg0 Arg) {
})
}
-// RemoveArg is the public alias for the removeArg method.
-func RemoveArg(arg Arg) {
- removeArg(arg)
-}
-
// RemoveCall removes call idx from p.
func (p *Prog) RemoveCall(idx int) {
c := p.Calls[idx]