diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-19 14:14:10 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-20 07:33:29 +0000 |
| commit | d922ca7efda29b23dfb85abe37aee1641c4fbe05 (patch) | |
| tree | 7c7d78500ef5536f36717c45de2e0adeb1a62a33 /tools | |
| parent | 37668e463d42d68846539559443ec458c9b05acb (diff) | |
syz-ci: specify per-manager bisection backports
It might be the case that the kernels that are being fuzzed on syz-ci
require their own backports to build/test older revisions during
bisection.
Let users specify it in the syz-ci config.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-bisect/bisect.go | 8 | ||||
| -rw-r--r-- | tools/syz-testbuild/testbuild.go | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/syz-bisect/bisect.go b/tools/syz-bisect/bisect.go index e9b5f1b49..b74cf6fd8 100644 --- a/tools/syz-bisect/bisect.go +++ b/tools/syz-bisect/bisect.go @@ -62,9 +62,10 @@ type Config struct { // Sysctl/cmdline files used to build the image which was used to crash the kernel, e.g. see: // dashboard/config/upstream.sysctl // dashboard/config/upstream-selinux.cmdline - Sysctl string `json:"sysctl"` - Cmdline string `json:"cmdline"` - CrossTree bool `json:"cross_tree"` + Sysctl string `json:"sysctl"` + Cmdline string `json:"cmdline"` + CrossTree bool `json:"cross_tree"` + Backports []vcs.BackportCommit `json:"backports"` KernelConfig string `json:"kernel_config"` KernelBaselineConfig string `json:"kernel_baseline_config"` @@ -114,6 +115,7 @@ func main() { Userspace: mycfg.Userspace, Sysctl: mycfg.Sysctl, Cmdline: mycfg.Cmdline, + Backports: mycfg.Backports, }, Syzkaller: bisect.SyzkallerConfig{ Repo: mycfg.SyzkallerRepo, diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go index dac89bfcc..daadff3e3 100644 --- a/tools/syz-testbuild/testbuild.go +++ b/tools/syz-testbuild/testbuild.go @@ -125,7 +125,7 @@ func main() { func test(repo vcs.Repo, bisecter vcs.Bisecter, kernelConfig []byte, env instance.Env, com *vcs.Commit) { compiler, compilerType, linker, ccache := "gcc", "gcc", "ld", "" - bisectEnv, err := bisecter.EnvForCommit(compiler, compilerType, *flagBisectBin, com.Hash, kernelConfig) + bisectEnv, err := bisecter.EnvForCommit(compiler, compilerType, *flagBisectBin, com.Hash, kernelConfig, nil) if err != nil { tool.Fail(err) } |