kernel: Cherry-pick fix for CVE-2023-20588 ("DIV0") #3373
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-20588 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. Bring in an extra commit (x86/bugs: Increase the x86 bugs vector size to two u32s) as a dependency. Contextual changes are necessary to make these patches apply as we currently carry Amazon Linux' patches mitigating GDS and SRSO instead of upstream variants of these patches. Signed-off-by: Leonard Foerster <[email protected]>
The fic for CVE-2023-20588 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. Bring in an extra commit (x86/bugs: Increase the x86 bugs vector size to two u32s) as a dependency. Contextual changes are necessary to make these patches apply as we currently carry Amazon Linux' patches mitigating GDS and SRSO instead of upstream variants of these patches. Signed-off-by: Leonard Foerster <[email protected]>
The fix for CVE-2023-20588 is currently only available in the knerel.org upstream 6.1 stable kernel, but not yet in an Amazon Linux kernel release. Cherry-pick it from the upstream kernel. Bring in an extra commit (x86/bugs: Increase the x86 bugs vector size to two u32s) as a dependency. Contextual changes are necessary to make these patches apply as we currently carry Amazon Linux' patches mitigating GDS and SRSO instead of upstream vairants of these patches. Signed-off-by: Leonard Foerster <[email protected]>
stmcginnis
approved these changes
Aug 29, 2023
|
So, I was planning to check the patch is actually working correctly, assuming that we do have AMD Zen1 based platforms available in EC2. We do not, so we can not really test this CVE fix working and have to trust upstream here. I went ahead and did run a sonobuoy quick test to ensure the base functionality is not negatively impacted on another AMD platform (c5a.large - Zen2 CPUs) though: |
markusboehme
approved these changes
Aug 30, 2023
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-20588 ("DIV0") 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 augmentation of the x86 bugs vector to two words.
Testing done:
I have done some light build testing. Still need to do proper validation of the fix on appropriate instances.
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.