Skip to content

Commit fb8f743

Browse files
committed
syz-cluster: add bpf tree info and configs
Fuzz bpf patches differently from net patches. Monitor netfilter and bpf mailing lists
1 parent 2e16ac1 commit fb8f743

File tree

4 files changed

+64
-1
lines changed

4 files changed

+64
-1
lines changed

syz-cluster/overlays/gke/prod/global-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ data:
1111
parallelWorkflows: 7
1212
loreArchives:
1313
- netdev
14+
- bpf
1415
- linux-ext4
16+
- netfilter-devel
1517
emailReporting:
1618
name: "syzbot ci"
1719
sender: dashapi

syz-cluster/pkg/api/api.go

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,18 +204,39 @@ var DefaultTrees = []*Tree{
204204
KernelConfig: `upstream-apparmor-kasan.config`,
205205
FuzzConfig: `net`,
206206
},
207+
{
208+
Name: `bpf`,
209+
URL: `https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf.git`,
210+
Branch: `master`,
211+
Priority: TreePriorityNever,
212+
EmailLists: []string{`bpf@vger.kernel.org`},
213+
KernelConfig: `upstream-apparmor-kasan.config`,
214+
FuzzConfig: `bpf`,
215+
},
216+
{
217+
Name: `bpf-next`,
218+
URL: `https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next.git`,
219+
Branch: `master`,
220+
Priority: 2,
221+
EmailLists: []string{`bpf@vger.kernel.org`},
222+
KernelConfig: `upstream-apparmor-kasan.config`,
223+
FuzzConfig: `bpf`,
224+
},
207225
}
208226

209227
const (
210228
netCorpusURL = `https://storage.googleapis.com/syzkaller/corpus/ci-upstream-net-kasan-gce-corpus.db`
229+
bpfCorpusURL = `https://storage.googleapis.com/syzkaller/corpus/ci-upstream-bpf-kasan-gce-corpus.db`
211230
corpusFallbackURL = `https://storage.googleapis.com/syzkaller/corpus/ci-upstream-kasan-gce-root-corpus.db`
212231
)
213232

214233
// TODO: find a better place for it.
215234
func (tree *Tree) CorpusURL() string {
216235
switch tree.FuzzConfig {
217-
case `net`, `net-next`, `nf`, `nf-next`:
236+
case `net`:
218237
return netCorpusURL
238+
case `bpf`:
239+
return bpfCorpusURL
219240
default:
220241
return corpusFallbackURL
221242
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"name": "base",
3+
"target": "linux/amd64",
4+
"kernel_obj": "/base/obj",
5+
"kernel_build_src": "/workdir",
6+
"image": "/base/image",
7+
"syzkaller": "/syzkaller",
8+
"workdir": "/workdir",
9+
"type": "qemu",
10+
"enable_syscalls": [
11+
"bpf", "mkdir", "mount$bpf", "unlink", "close",
12+
"perf_event_open*", "ioctl$PERF*", "getpid", "gettid",
13+
"socketpair", "sendmsg", "recvmsg", "setsockopt$sock_attach_bpf",
14+
"socket$kcm", "ioctl$sock_kcm*", "syz_clone",
15+
"mkdirat$cgroup*", "openat$cgroup*", "write$cgroup*",
16+
"openat$tun", "write$tun", "ioctl$TUN*", "ioctl$SIOCSIFHWADDR",
17+
"openat$ppp", "syz_open_procfs$namespace"
18+
],
19+
"procs": 3,
20+
"sandbox": "none",
21+
"experimental": {"cover_edges": false},
22+
"vm": {
23+
"count": 4,
24+
"cmdline": "root=/dev/sda1",
25+
"kernel": "/base/kernel",
26+
"cpu": 2,
27+
"mem": 3072,
28+
"qemu_args": "-machine pc-q35-7.1 -enable-kvm -smp 2,sockets=2,cores=1"
29+
}
30+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "patched",
3+
"target": "linux/amd64",
4+
"kernel_obj": "/patched/obj",
5+
"image": "/patched/image",
6+
"vm": {
7+
"count": 10,
8+
"kernel": "/patched/kernel"
9+
}
10+
}

0 commit comments

Comments
 (0)