align kernel configs for 6.1 and 6.12 - #216
Merged
Merged
Conversation
added 2 commits
July 22, 2025 15:33
The zboot patches that missed the 6.1 merge window were backported to Amazon Linux's 6.1 kernel, so the issue that blocked adoption - the need to sign both the "outer" EFI decompressor and the "inner" kernel payload - is no longer present, and zboot-compressed kernel images now work fine with Secure Boot. Signed-off-by: Ben Cressey <bcressey@amazon.com>
This follows the equivalent change to the 6.12 kernel in 6dfbd17. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Build the kernel with support for the Landlock LSM, and include it in the list of LSMs that will be enabled during boot. Signed-off-by: Ben Cressey <bcressey@amazon.com>
arnaldo2792
approved these changes
Jul 22, 2025
bcressey
force-pushed
the
align-kernel-configs
branch
from
July 22, 2025 16:38
0bd1d54 to
f9058f4
Compare
bcressey
commented
Jul 22, 2025
| CONFIG_SECURITY_LANDLOCK=y | ||
|
|
||
| # Add landlock to the list of LSMs. | ||
| CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor,bpf" |
Contributor
Author
There was a problem hiding this comment.
This is the upstream default for kernel 6.1: Kconfig.
| CONFIG_SECURITY_LANDLOCK=y | ||
|
|
||
| # Add landlock to the list of LSMs. | ||
| CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,selinux,smack,tomoyo,apparmor,ipe,bpf" |
Contributor
Author
There was a problem hiding this comment.
This is the upstream default for kernel 6.12: Kconfig.
arnaldo2792
self-requested a review
July 22, 2025 17:17
arnaldo2792
approved these changes
Jul 22, 2025
rpkelly
approved these changes
Jul 23, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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:
Fixes: #212
Description of changes:
Switch to zboot for arm64 images on the 6.1 kernel, now that Amazon Linux has backported the remainder of zboot support.
Use lz4 for zram compression with the 6.1 kernel, to match the 6.12 config.
Turn on the Landlock LSM for the 6.1 kernel, and enable it by default for both kernels.
Testing done:
Verified that zboot is used for aarch64:
Verified that lz4 is used for zram:
Verified that Landlock is enabled and that
landrunworks:dmesgbefore the change shows Landlock is not enabled:dmesgafter the change shows Lockdown is enabled: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.