Skip to content

Commit 42ef1f0

Browse files
committed
syz-cluster: enable KMSAN for net patch series
Set up a KMSAN fuzzing campaign in parallel to KASAN for the net patches.
1 parent e89c161 commit 42ef1f0

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

syz-cluster/pkg/api/api.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ type KernelFuzzConfig struct {
5959
CorpusURL string `json:"corpus_url"`
6060
SkipCoverCheck bool `json:"skip_cover_check"`
6161
BugTitleRe string `json:"bug_title_re"`
62+
KMSAN bool `json:"kmsan"` // Trigger the config changes necessary for KMSAN.
6263
}
6364

6465
// FuzzTriageTarget is a single record in the list of supported fuzz configs.
@@ -258,7 +259,10 @@ const (
258259
allCorpusURL = `https://storage.googleapis.com/syzkaller/corpus/ci-upstream-kasan-gce-root-corpus.db`
259260
)
260261

261-
const kasanTrack = "KASAN"
262+
const (
263+
kasanTrack = "KASAN"
264+
kmsanTrack = "KMSAN"
265+
)
262266

263267
// The list is ordered by decreasing importance.
264268
var FuzzTargets = []*FuzzTriageTarget{
@@ -308,6 +312,13 @@ var FuzzTargets = []*FuzzTriageTarget{
308312
Focus: FocusNet,
309313
CorpusURL: netCorpusURL,
310314
},
315+
{
316+
Track: kmsanTrack,
317+
KernelConfig: `upstream-kmsan.config`,
318+
Focus: FocusNet,
319+
CorpusURL: netCorpusURL,
320+
KMSAN: true,
321+
},
311322
},
312323
},
313324
{

syz-cluster/pkg/triage/fuzz_target.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func mergeFuzzConfigs(configs []*api.KernelFuzzConfig) *api.FuzzConfig {
8080
// Must be the same.
8181
ret.BugTitleRe = config.BugTitleRe
8282
ret.Track = config.Track
83+
ret.KMSAN = config.KMSAN
8384
}
8485
ret.Focus = unique(ret.Focus)
8586
ret.CorpusURLs = unique(ret.CorpusURLs)

syz-cluster/pkg/triage/fuzz_target_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func TestMergeKernelFuzzConfigs(t *testing.T) {
7474
FuzzConfig: &api.FuzzConfig{
7575
Track: "KMSAN",
7676
Focus: []string{"net"},
77+
KMSAN: true,
7778
},
7879
},
7980
}, MergeKernelFuzzConfigs([]*api.KernelFuzzConfig{
@@ -86,6 +87,7 @@ func TestMergeKernelFuzzConfigs(t *testing.T) {
8687
Track: "KMSAN",
8788
KernelConfig: "kmsan_config",
8889
Focus: "net",
90+
KMSAN: true,
8991
},
9092
}))
9193
})

0 commit comments

Comments
 (0)