From d4d447cd780753901f9e00aa246cc835458a8f06 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Mon, 14 Sep 2020 17:12:55 +1000 Subject: tools/create-image.sh: upgrade default release to bullseye bullseye has been the current Debian stable release since 2021, and stretch is now well and truly in the LTS support phase. Change the default release in create-image.sh to bullseye. Also update most other references to stretch in the documentation and elsewhere (there's still a few references we don't change because they're links to images etc). Signed-off-by: Andrew Donnellan --- .../linux/setup_linux-host_qemu-vm_s390x-kernel.md | 6 +++--- .../setup_ubuntu-host_qemu-vm_x86-64-kernel.md | 22 ++++++++++++---------- .../setup_ubuntu-host_vmware-vm_x86-64-kernel.md | 10 +++++----- docs/linux/troubleshooting.md | 4 ++-- 4 files changed, 22 insertions(+), 20 deletions(-) (limited to 'docs/linux') diff --git a/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md b/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md index adcb63c75..f0fab769c 100644 --- a/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md +++ b/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md @@ -83,16 +83,16 @@ $KERNEL/arch/s390/boot/bzImage ### Debian -To create a Debian Buster Linux image with the minimal set of required packages do: +To create a Debian Linux image with the minimal set of required packages do: ``` cd $IMAGE/ wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-image.sh -O create-image.sh chmod +x create-image.sh -./create-image.sh -a s390x -d buster +./create-image.sh -a s390x ``` -The result should be `$IMAGE/buster.img` disk image. +The result should be `$IMAGE/bullseye.img` disk image. For additional options of `create-image.sh`, please refer to `./create-image.sh -h` diff --git a/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md b/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md index 004f07a6f..3646cf046 100644 --- a/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md +++ b/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md @@ -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 Stretch 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 Bullseye 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. @@ -75,7 +75,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_KASAN=y CONFIG_KASAN_INLINE=y -# Required for Debian Stretch +# Required for Debian Stretch and later CONFIG_CONFIGFS_FS=y CONFIG_SECURITYFS=y ``` @@ -136,9 +136,9 @@ Command: sudo apt install debootstrap ``` -### Create Debian Stretch Linux image +### Create Debian Bullseye Linux image -Create a Debian Stretch Linux image with the minimal set of required packages. +Create a Debian Bullseye Linux image with the minimal set of required packages. Command: ``` bash @@ -149,9 +149,11 @@ chmod +x create-image.sh ./create-image.sh ``` -The result should be `$IMAGE/stretch.img` disk image. +The result should be `$IMAGE/bullseye.img` disk image. -### OR Create Debian Buster Linux 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. Command: ``` bash @@ -196,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/stretch.img,format=raw \ + -drive file=$IMAGE/bullseye.img,format=raw \ -net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \ -net nic,model=e1000 \ -enable-kvm \ @@ -228,7 +230,7 @@ After that you should be able to ssh to QEMU instance in another terminal. Command: ``` bash -ssh -i $IMAGE/stretch.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost +ssh -i $IMAGE/bullseye.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost ``` ### Troubleshooting @@ -257,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/stretch.img", - "sshkey": "$IMAGE/stretch.id_rsa", + "image": "$IMAGE/bullseye.img", + "sshkey": "$IMAGE/bullseye.id_rsa", "syzkaller": "$GOPATH/src/github.com/google/syzkaller", "procs": 8, "type": "qemu", diff --git a/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md b/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md index f1f7d8db8..1b2daf328 100644 --- a/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md +++ b/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md @@ -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 Stretch 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 Bullseye 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. @@ -16,15 +16,15 @@ Install debootstrap: sudo apt-get install debootstrap ``` -To create a Debian Stretch Linux user space in the $USERSPACE dir do: +To create a Debian Bullseye Linux user space in the $USERSPACE dir do: ``` -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 stretch $USERSPACE +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 ``` 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 Stretch Linux VMDK do: +To create a Debian Bullseye Linux VMDK do: ``` wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-gce-image.sh -O create-gce-image.sh diff --git a/docs/linux/troubleshooting.md b/docs/linux/troubleshooting.md index 3993dc1f6..ee706e5c3 100644 --- a/docs/linux/troubleshooting.md +++ b/docs/linux/troubleshooting.md @@ -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/stretch.img", - "sshkey": "$IMAGE/stretch.id_rsa", + "image": "$IMAGE/bullseye.img", + "sshkey": "$IMAGE/bullseye.id_rsa", "syzkaller": "$GOPATH/src/github.com/google/syzkaller", "procs": 8, "type": "qemu", -- cgit mrf-deployment