Cherry-pick fix for CVE-2023-20593 ("Zenbleed") #3300
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The fix for CVE-2023-20593 is currently only available in the kernel.org upstream 6.1 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]>
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]>
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]>
stmcginnis
approved these changes
Jul 27, 2023
foersleo
approved these changes
Jul 27, 2023
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number: n/a
Description of changes: Cherry-pick the software mitigation for CVE-2023-20593 ("Zenbleed") from the latest upstream stable kernel releases. Kept in separate commits to aid updating the individual kernel series as Bottlerocket's Amazon Linux upstream releases them. This also picks up a required refactoring commit that only moves code around.
Testing done: I tested kernels 5.10 and 5.15 with the aws-k8s-1.23 and aws-k8s-1.24 variants, respectively. For kernel 6.1, I built an additional, modified aws-k8s-1.24 variant that uses the 6.1 kernel instead.
Confirmed the patches apply cleanly and the mitigation does not kick in on virtual machines (e.g. c5a.large EC2 instance) or on machines with different micro architecture (e.g. Zen 3 on c6a.meta EC2 instance). I did not have access to an affected Zen 2 machine.
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.