Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.14.x] Cherry-pick fix for CVE-2023-20593 ("Zenbleed") #3301

Conversation

markusboehme
Copy link
Member

Issue number: n/a

Description of changes: Cherry-picking the changes from #3300 onto the 1.14.x branch. These changes cherry-pick the software mitigation for CVE-2023-20593 ("Zenbleed") from the latest upstream stable kernel releases (second-level cherry-picking 🍒). Note that I didn't cherry-pick the fix for the 6.1 kernel series, since it wasn't released on 1.14.0 yet.

Testing done:

Built and boot-tested the aws-k8s-1.23 (kernel 5.10) and aws-k8s-1.24 (kernel 5.15) variants for x86_64.

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.

The fix for CVE-2023-20593 is currently only available in the kernel.org
upstream 5.15 stable kernel, but not yet in an Amazon Linux kernel
release. Cherry-pick it from the upstream kernel.

Signed-off-by: Markus Boehme <[email protected]>
(cherry picked from commit 64d9e49)
The fix for CVE-2023-20593 is currently only available in the kernel.org
upstream 5.10 stable kernel, but not yet in an Amazon Linux kernel
release. Cherry-pick it from the upstream kernel.

Signed-off-by: Markus Boehme <[email protected]>
(cherry picked from commit 512b5c4)
@markusboehme markusboehme merged commit 12b7a01 into bottlerocket-os:1.14.x Jul 27, 2023
43 checks passed
@stmcginnis stmcginnis mentioned this pull request Aug 1, 2023
4 tasks
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