Skip to content

Bump kernel base from v6.1 to v6.1.170#37

Merged
flowzone-app[bot] merged 1 commit into
mainfrom
kyle/CVE-2026-31431
Apr 30, 2026
Merged

Bump kernel base from v6.1 to v6.1.170#37
flowzone-app[bot] merged 1 commit into
mainfrom
kyle/CVE-2026-31431

Conversation

@klutchell
Copy link
Copy Markdown
Contributor

@klutchell klutchell commented Apr 30, 2026

Summary

  • Bump kernel git pin from bare v6.1 (Dec 2022) to v6.1.170, picking up ~170 stable releases worth of accumulated security and bug fixes.
  • Introduce a separate KERNEL_VERSION arg/variable (defaulting to 6.1.170) so future stable bumps require a single value change while KERNEL_BRANCH=6.1 continues to identify the patches//config/ subdirectories.
  • Switch the clone source from torvalds/linux to gregkh/linuxtorvalds/linux only carries mainline tags, so it has v6.1 (which worked by coincidence) but not any v6.1.y point release. The previous setup was effectively pinned to the .0 release with no path to picking up stable patches.

Context — CVE-2026-31431 ("Copy Fail" / algif_aead)

This work was kicked off by CVE-2026-31431, an unprivileged-LPE / container-escape primitive in crypto/algif_aead.c. Investigation found:

  • The fix is not yet in any linux-6.1.y release. Mainline fix is a664bf3d603d (in 7.0); stable fixes are in 6.18.22 and 6.19.12. Eric Biggers posted a 9-patch backport for 6.1.y on 2026-04-30 (lore) — it was in stable-review at the time of this PR and expected in 6.1.171+.
  • This kernel build is unaffected in practice. Both arch configs already have # CONFIG_CRYPTO_USER_API_AEAD is not set (along with the rest of CONFIG_CRYPTO_USER_API_* and CONFIG_CRYPTO_AUTHENC), so the entire AF_ALG userspace surface is unbuilt — there is no algif_aead module/built-in in the produced vmlinux.

Verification

  • git ls-remote confirms v6.1.170 resolves to 02d4d51a937120cc924e3df214b1ff271234f020 on gregkh/linux (and the canonical kernel.org stable/linux.git).
  • Existing patches/6.1/0001-UBUNTU-SAUCE-... and 0002-HACK-... patches still apply cleanly to kernel/sys.c at v6.1.170 (verified via git apply --check against a temp checkout).

Pull in ~170 stable releases of security and bug fixes accumulated
since the original v6.1 (December 2022) tag. Notable: the build was
missing every linux-6.1.y backport, including a long backlog of CVE
fixes unrelated to AF_ALG.

Introduces KERNEL_VERSION (defaulting to 6.1.170) as the actual git
tag to clone, while KERNEL_BRANCH (6.1) continues to identify the
patches/ and config/ subdirectories — so future stable bumps only
need a single value change.

Notes on CVE-2026-31431 ("Copy Fail", algif_aead): the upstream fix
(mainline a664bf3d603d) is currently in stable-review for 6.1.y
(Eric Biggers' [PATCH 6.1 0/9] AF_ALG fixes, lore 20260430062731)
and not yet in any 6.1.y release. This kernel build is unaffected
in practice because CONFIG_CRYPTO_USER_API_AEAD (and the rest of
CONFIG_CRYPTO_USER_API_*) is already =n in both arch configs, so
the algif_aead module is never compiled in. Re-bump to 6.1.171+ once
the series lands upstream.

Change-type: patch
Signed-off-by: Kyle Harding <kyle@balena.io>
@klutchell klutchell requested a review from a team April 30, 2026 13:20
@flowzone-app flowzone-app Bot merged commit 488ad6c into main Apr 30, 2026
50 checks passed
@flowzone-app flowzone-app Bot deleted the kyle/CVE-2026-31431 branch April 30, 2026 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants