Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ Tudor Ambarus
Elektrobit Automotive GmbH
Rivos Inc.
Jeongjun Park
International Business Machines Corporation
4 changes: 4 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,7 @@ Jeongjun Park
Nikita Zhandarovich
Jiacheng Xu
Kuzey Arda Bulut
International Business Machines Corporation
Andrew Donnellan
Alexander Egorenkov
Alexey Kardashevskiy
10 changes: 5 additions & 5 deletions docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ chmod +x create-image.sh
./create-image.sh -a s390x
```

The result should be `$IMAGE/bullseye.img` disk image.
The result should be `$IMAGE/trixie.img` disk image.

For additional options of `create-image.sh`, please refer to `./create-image.sh -h`

Expand All @@ -106,7 +106,7 @@ Run:
qemu-system-s390x \
-M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 \
-kernel $KERNEL/arch/s390/boot/bzImage \
-drive file=$IMAGE/buster.img,if=virtio,format=raw \
-drive file=$IMAGE/trixie.img,if=virtio,format=raw \
-append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" \
-net nic,model=virtio -net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \
-display none -serial mon:stdio \
Expand All @@ -116,7 +116,7 @@ qemu-system-s390x \
After that you should be able to ssh to QEMU instance in another terminal:

``` bash
ssh -i $IMAGE/buster.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
ssh -i $IMAGE/trixie.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
```

If this fails with "too many tries", ssh may be passing default keys before
Expand Down Expand Up @@ -147,8 +147,8 @@ variables `$GOPATH`, `$KERNEL` and `$IMAGE` with their actual values.
"http": "127.0.0.1:56741",
"workdir": "$GOPATH/src/github.com/google/syzkaller/workdir",
"kernel_obj": "$KERNEL",
"image": "$IMAGE/buster.img",
"sshkey": "$IMAGE/buster.id_rsa",
"image": "$IMAGE/trixie.img",
"sshkey": "$IMAGE/trixie.id_rsa",
"syzkaller": "$GOPATH/src/github.com/google/syzkaller",
"procs": 8,
"type": "qemu",
Expand Down
20 changes: 10 additions & 10 deletions docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup: Ubuntu host, QEMU vm, x86-64 kernel

These are the instructions on how to fuzz the x86-64 kernel in a QEMU with Ubuntu on the host machine and Debian Bullseye in the QEMU instances.
These are the instructions on how to fuzz the x86-64 kernel in a QEMU with Ubuntu on the host machine and Debian Trixie in the QEMU instances.

In the instructions below, the `$VAR` notation (e.g. `$GCC`, `$KERNEL`, etc.) is used to denote paths to directories that are either created when executing the instructions (e.g. when unpacking GCC archive, a directory will be created), or that you have to create yourself before running the instructions. Substitute the values for those variables manually.

Expand Down Expand Up @@ -136,9 +136,9 @@ Command:
sudo apt install debootstrap
```

### Create Debian Bullseye Linux image
### Create Debian Trixie Linux image

Create a Debian Bullseye Linux image with the minimal set of required packages.
Create a Debian Trixie Linux image with the minimal set of required packages.

Command:
``` bash
Expand All @@ -149,15 +149,15 @@ chmod +x create-image.sh
./create-image.sh
```

The result should be `$IMAGE/bullseye.img` disk image.
The result should be `$IMAGE/trixie.img` disk image.

### OR Create Debian Linux image with a different version

To create a Debian image with a different version (e.g. buster, stretch, sid), specify the `--distribution` option.
To create a Debian image with a different version (e.g. bookworm, bullseye, sid), specify the `--distribution` option.

Command:
``` bash
./create-image.sh --distribution buster
./create-image.sh --distribution bookworm
```

### Image extra tools
Expand Down Expand Up @@ -198,7 +198,7 @@ qemu-system-x86_64 \
-smp 2 \
-kernel $KERNEL/arch/x86/boot/bzImage \
-append "console=ttyS0 root=/dev/sda earlyprintk=serial net.ifnames=0" \
-drive file=$IMAGE/bullseye.img,format=raw \
-drive file=$IMAGE/trixie.img,format=raw \
-net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \
-net nic,model=e1000 \
-enable-kvm \
Expand Down Expand Up @@ -230,7 +230,7 @@ After that you should be able to ssh to QEMU instance in another terminal.

Command:
``` bash
ssh -i $IMAGE/bullseye.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
ssh -i $IMAGE/trixie.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
```

### Troubleshooting
Expand Down Expand Up @@ -259,8 +259,8 @@ variables `$GOPATH`, `$KERNEL` and `$IMAGE` with their actual values.
"http": "127.0.0.1:56741",
"workdir": "$GOPATH/src/github.com/google/syzkaller/workdir",
"kernel_obj": "$KERNEL",
"image": "$IMAGE/bullseye.img",
"sshkey": "$IMAGE/bullseye.id_rsa",
"image": "$IMAGE/trixie.img",
"sshkey": "$IMAGE/trixie.id_rsa",
"syzkaller": "$GOPATH/src/github.com/google/syzkaller",
"procs": 8,
"type": "qemu",
Expand Down
10 changes: 5 additions & 5 deletions docs/linux/setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup: Ubuntu host, VirtualBox vm, x86-64 kernel

These are the instructions on how to fuzz the x86-64 kernel in VirtualBox with Ubuntu on the host machine and Debian Bullseye in the virtual machines.
These are the instructions on how to fuzz the x86-64 kernel in VirtualBox with Ubuntu on the host machine and Debian Trixie in the virtual machines.

In the instructions below, the `$VAR` notation (e.g. `$GCC`, `$KERNEL`, etc.) is used to denote paths to directories that are either created when executing the instructions (e.g. when unpacking GCC archive, a directory will be created), or that you have to create yourself before running the instructions. Substitute the values for those variables manually.

Expand All @@ -16,15 +16,15 @@ Install debootstrap:
sudo apt-get install debootstrap
```

To create a Debian Bullseye Linux user space in the $USERSPACE dir do:
To create a Debian Trixie Linux user space in the $USERSPACE dir do:
```
sudo mkdir -p $USERSPACE
sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free bullseye $USERSPACE
sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free trixie $USERSPACE
```

Note: it is important to include the `open-vm-tools` package in the user space as it provides better VM management.

To create a Debian Bullseye Linux VMDK do:
To create a Debian Trixie Linux VMDK do:

```
wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-gce-image.sh -O create-gce-image.sh
Expand Down Expand Up @@ -103,4 +103,4 @@ Syzkaller will create full clone VMs from the `debian` VM and then use ssh to co
The `debian` VM will not be started and its disk will remain unmodified.

If you get issues after `syz-manager` starts, consider running it with the `-debug` flag.
Also see [this page](/docs/troubleshooting.md) for troubleshooting tips.
Also see [this page](/docs/troubleshooting.md) for troubleshooting tips.
8 changes: 4 additions & 4 deletions docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup: Ubuntu host, VMware vm, x86-64 kernel

These are the instructions on how to fuzz the x86-64 kernel in VMware Workstation with Ubuntu on the host machine and Debian Bullseye in the virtual machines.
These are the instructions on how to fuzz the x86-64 kernel in VMware Workstation with Ubuntu on the host machine and Debian Trixie in the virtual machines.

In the instructions below, the `$VAR` notation (e.g. `$GCC`, `$KERNEL`, etc.) is used to denote paths to directories that are either created when executing the instructions (e.g. when unpacking GCC archive, a directory will be created), or that you have to create yourself before running the instructions. Substitute the values for those variables manually.

Expand All @@ -16,15 +16,15 @@ Install debootstrap:
sudo apt-get install debootstrap
```

To create a Debian Bullseye Linux user space in the $USERSPACE dir do:
To create a Debian Trixie Linux user space in the $USERSPACE dir do:
```
sudo mkdir -p $USERSPACE
sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free bullseye $USERSPACE
sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free trixie $USERSPACE
```

Note: it is important to include the `open-vm-tools` package in the user space as it provides better VM management.

To create a Debian Bullseye Linux VMDK do:
To create a Debian Trixie Linux VMDK do:

```
wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-gce-image.sh -O create-gce-image.sh
Expand Down
4 changes: 2 additions & 2 deletions docs/linux/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ Here are some things to check if there are problems running syzkaller.
"http": "127.0.0.1:56741",
"workdir": "$GOPATH/src/github.com/google/syzkaller/workdir",
"kernel_obj": "$KERNEL",
"image": "$IMAGE/bullseye.img",
"sshkey": "$IMAGE/bullseye.id_rsa",
"image": "$IMAGE/trixie.img",
"sshkey": "$IMAGE/trixie.id_rsa",
"syzkaller": "$GOPATH/src/github.com/google/syzkaller",
"procs": 8,
"type": "qemu",
Expand Down
2 changes: 1 addition & 1 deletion docs/syz-kfuzztest.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ enabled. Namely

Furthermore, as you will need to connect to the VM being tested through SSH and
launch `syz-kfuzztest` _(a Go binary with LIBC dependencies)_, it is recommended
to create an image for the kernel being fuzzed (e.g., a Debian Bullseye image).
to create an image for the kernel being fuzzed (e.g., a Debian Trixie image).
Detailed instructions on how to do this can be found in
[this setup guide](linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md).

Expand Down
4 changes: 2 additions & 2 deletions docs/syz_testbed.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ other. The tool automates checking out syzkaller repos, building them, running
"manager_config": {
"target": "linux/amd64",
"kernel_obj": "/tmp/linux-stable",
"image": "/tmp/kernel-image/bullseye.img",
"sshkey": "/tmp/kernel-image/bullseye.id_rsa",
"image": "/tmp/kernel-image/trixie.img",
"sshkey": "/tmp/kernel-image/trixie.id_rsa",
"procs": 8,
"type": "qemu",
"vm": {
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/zh_CN/executing_syzkaller_programs.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ make
4. 将构建好的二进制文件和程序复制到待测试机器上(根据待测试机器,替换命令中的 `linux_amd64`)

``` bash
scp -P 10022 -i bullseye.img.key bin/linux_amd64/syz-execprog bin/linux_amd64/syz-executor program root@localhost:
scp -P 10022 -i trixie.img.key bin/linux_amd64/syz-execprog bin/linux_amd64/syz-executor program root@localhost:
```

5. 在待测试机器上运行程序
Expand Down
4 changes: 2 additions & 2 deletions docs/translations/zh_CN/syz_testbed.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ syz-testbed 需要一个 JSON 配置文件。示例:
"manager_config": {
"target": "linux/amd64",
"kernel_obj": "/tmp/linux-stable",
"image": "/tmp/kernel-image/bullseye.img",
"sshkey": "/tmp/kernel-image/bullseye.id_rsa",
"image": "/tmp/kernel-image/trixie.img",
"sshkey": "/tmp/kernel-image/trixie.id_rsa",
"procs": 8,
"type": "qemu",
"vm": {
Expand Down
2 changes: 1 addition & 1 deletion tools/create-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi

# Variables affected by options
ARCH=$(uname -m)
RELEASE=bullseye
RELEASE=trixie
FEATURE=minimal
SEEK=2047
PERF=false
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN mkdir -p /syzkaller/gopath/src/github.com/google/syzkaller && \
# To build root image run:
# docker run -it --rm --privileged --device /dev/loop0 gcr.io/syzkaller/env
# mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
# create-image.sh -a s390x -d buster
# create-image.sh -a <ARCH> -d <DEBIAN RELEASE>

RUN curl https://storage.googleapis.com/syzkaller/fuchsia-toolchain.tar.gz | tar -C /syzkaller -xz
RUN curl https://storage.googleapis.com/syzkaller/netbsd-toolchain.tar.gz | tar -C /syzkaller -xz
Expand Down
Loading