diff --git a/NOTICE b/NOTICE index 282fe60..ffead04 100644 --- a/NOTICE +++ b/NOTICE @@ -46,6 +46,7 @@ Downloaded by images/linux-amd64-fc/install-firecracker.sh - Guest kernel vmlinux-6.1.186, built by Firecracker's CI (https:// s3.amazonaws.com/spec.ccfc.min/firecracker-ci/20260930-a738f18a8db0-0/ x86_64/vmlinux-6.1.186): the Linux kernel, GPL-2.0 WITH Linux-syscall-note. + With --kernel 6.18.51 the same CI set's vmlinux-6.18.51, same license. Downloaded by the image builds (images/*) diff --git a/docs/firecracker.md b/docs/firecracker.md index c623a86..349713e 100644 --- a/docs/firecracker.md +++ b/docs/firecracker.md @@ -388,6 +388,8 @@ Leave `SANDBOXD_GUEST_AGENT` unset; each image build script then builds ```sh # Firecracker v1.17.0 + jailer and guest kernel 6.1.186, each SHA-256 pinned. images/linux-amd64-fc/install-firecracker.sh /var/lib/sandboxd-fc +# Optional newer guest kernel (6.18.51, Landlock ABI 7), installed next to 6.1.186: +images/linux-amd64-fc/install-firecracker.sh --kernel 6.18.51 /var/lib/sandboxd-fc # Read-only review root image (debian:bookworm-slim by digest, git, bash, curl, # gcc/g++/make, python3, user 1000, plus the guest agent). Prints the path, # images/review-amd64-.ext4, about 600 MB. @@ -401,10 +403,19 @@ images/linux-amd64-fc/build.sh --go126 /var/lib/sandboxd-fc | --- | --- | | `bin/firecracker`, `bin/jailer` | v1.17.0 x86_64, release tarball SHA-256 `06094a11…de558` | | `kernel/vmlinux-6.1.186` | Firecracker CI kernel, SHA-256 `ea0e55d0…f69c8` | +| `kernel/vmlinux-6.18.51` | Only with `--kernel 6.18.51`: the same CI set, SHA-256 `0545ba17…1ed447` | | `images/review-amd64-.ext4` | The read-only root image, with its `.sha256` | | `images/review-go126-amd64-.ext4` | The read-only Go review image, with its `.sha256` | | `jail/`, `run/` | Per-VM state, empty when no VM exists | +A worker opts in to the newer kernel with `-fc-kernel +/var/lib/sandboxd-fc/kernel/vmlinux-6.18.51`; the choice is per instance, and +`6.1.186` stays the default. Firecracker's kernel policy lists 6.18 as a +supported guest since v1.16.1 (6.1 is past its minimum support date). A boot of +the hardened e2b profile with sandboxd c9c7e070 on Firecracker 1.17.0 reported +`uname` 6.18.51+ and Landlock ABI 7 (Deimos Forge, 2026-11); the other profiles +and images have not been exercised on it. + ### Go review image (`--go126`) The amd64 counterpart of the Mac's `review-go126` image diff --git a/images/linux-amd64-fc/install-firecracker.sh b/images/linux-amd64-fc/install-firecracker.sh index 4f4b809..a8b6ab0 100755 --- a/images/linux-amd64-fc/install-firecracker.sh +++ b/images/linux-amd64-fc/install-firecracker.sh @@ -1,17 +1,30 @@ #!/bin/sh # Installs the pinned Firecracker, jailer and guest kernel (docs/firecracker.md). -# Usage (root): images/linux-amd64-fc/install-firecracker.sh [/var/lib/sandboxd-fc] +# Usage (root): images/linux-amd64-fc/install-firecracker.sh [--kernel 6.18.51] [/var/lib/sandboxd-fc] # Every download is checked against the SHA-256 pinned here before use. +# --kernel selects another pinned guest kernel from the same Firecracker CI set; +# the default stays 6.1.186. 6.18.51 (Landlock ABI 7) is a Firecracker-supported +# guest kernel since v1.16.1. Both kernels can be installed side by side; each +# instance picks its own with -fc-kernel. set -eu +kernel_version=6.1.186 +if [ "${1:-}" = --kernel ]; then + [ $# -ge 2 ] || { echo "usage: $0 [--kernel 6.1.186|6.18.51] [dir]" >&2; exit 2; } + kernel_version=$2 + shift 2 +fi out=${1:-/var/lib/sandboxd-fc} fc_version=v1.17.0 fc_sha256=06094a1108ae9e82aa4c23a775aa92758f53f1175d422270d9d6162cb9ade558 fc_url=https://github.com/firecracker-microvm/firecracker/releases/download/$fc_version/firecracker-$fc_version-x86_64.tgz -# Firecracker CI's guest kernel for the v1.17 release line (6.1 LTS, with -# virtio-vsock, devtmpfs and IP autoconfiguration built in). -kernel_version=6.1.186 -kernel_sha256=ea0e55d03dbaebc79a58644308e0517b7a33f1530a84848d9edf47ffa61f69c8 +# Firecracker CI's guest kernels for the v1.17 release line (with virtio-vsock, +# devtmpfs and IP autoconfiguration built in). +case $kernel_version in +6.1.186) kernel_sha256=ea0e55d03dbaebc79a58644308e0517b7a33f1530a84848d9edf47ffa61f69c8 ;; +6.18.51) kernel_sha256=0545ba1781fc06cfa1d7699069057f4538103fd1644100cf0da434899a1ed447 ;; +*) echo "unsupported kernel $kernel_version (pinned: 6.1.186, 6.18.51)" >&2; exit 2 ;; +esac kernel_url=https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/20260930-a738f18a8db0-0/x86_64/vmlinux-$kernel_version work=$(mktemp -d /var/tmp/sbx-fc-install.XXXXXX)