From d922ca7efda29b23dfb85abe37aee1641c4fbe05 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Wed, 19 Jul 2023 14:14:10 +0200 Subject: 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. --- pkg/bisect/bisect.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkg/bisect/bisect.go') diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index dab1cb27c..cd20cca07 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -58,6 +58,8 @@ type KernelConfig struct { // this minimized one. BaselineConfig []byte Userspace string + // Extra commits to cherry pick to older kernel revisions. + Backports []vcs.BackportCommit } type SyzkallerConfig struct { @@ -566,7 +568,10 @@ func (env *env) build() (*vcs.Commit, string, error) { } bisectEnv, err := env.bisecter.EnvForCommit( - env.cfg.DefaultCompiler, env.cfg.CompilerType, env.cfg.BinDir, current.Hash, env.kernelConfig) + env.cfg.DefaultCompiler, env.cfg.CompilerType, + env.cfg.BinDir, current.Hash, env.kernelConfig, + env.cfg.Kernel.Backports, + ) if err != nil { return current, "", err } -- cgit mrf-deployment