Skip to content

kernel: fix Nitro Enclaves use-after-free on SLOT_ALLOC failure (6.1, 6.12, 6.18) - #550

Merged
maherthomsi merged 3 commits into
bottlerocket-os:developfrom
maherthomsi:enclaves-fix
Sep 10, 2026
Merged

kernel: fix Nitro Enclaves use-after-free on SLOT_ALLOC failure (6.1, 6.12, 6.18)#550
maherthomsi merged 3 commits into
bottlerocket-os:developfrom
maherthomsi:enclaves-fix

Conversation

@maherthomsi

Copy link
Copy Markdown
Contributor

Description of changes:
Backports the upstream fix for a use-after-free in the Nitro Enclaves guest driver's enclave-creation error path, applied to all three kernels (6.1, 6.12, 6.18) as one patch per package.

Upstream: https://lore.kernel.org/stable/20260909124400.27857-1-graf@amazon.com/T/#u.

Testing done:
Built a kernel-kit AMI and booted it (aws-k8s-1.36, x86_64):

  • Kernel boots cleanly; EC2 status checks pass.
  • No panic in serial console.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Signed-off-by: Maher Homsi <maherhom@amazon.com>
Signed-off-by: Maher Homsi <maherhom@amazon.com>
Signed-off-by: Maher Homsi <maherhom@amazon.com>
@maherthomsi
maherthomsi merged commit 921516c into bottlerocket-os:develop Sep 10, 2026
3 checks passed
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.

3 participants