Standardize LCOW uVM bootfiles update #1861
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
katiewasnothere
approved these changes
Oct 23, 2023
`NewDefaultOptionsLCOW` sets `RootFSFile` and `KernelFile` depending on the contents of the (default) `BootFilesPath` directory and `KerenelDirect` field. However, if `BootFilesPath` is subsequently updated, those fields are not updated. This can result in inconsistent behavior, where (depending on if the default `BootFilesPath` contains `vmlinux` and `rootfs.vhd` files), a uVM created with an overridden `BootFilesPath` may either use `initrd` (`kernel`) or `vmlinux` (`rootfs.vhd`), respectively. Add a `UpdateBootFilesPath` function to consistently change the `BootFilesPath` and associated options. Update annotation handling to use `UpdateBootFilesPath`. Security policy is still performed after the update, so settings will be re-overridden for the confidential case, or by other annotations, so existing (normal) behavior is persisted. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
force-pushed
the
uvm-boot-files
branch
from
2a9fc7e
to
95492db
Compare
princepereira
pushed a commit
to princepereira/hcsshim
that referenced
this pull request
Aug 29, 2024
`NewDefaultOptionsLCOW` sets `RootFSFile` and `KernelFile` depending on the contents of the (default) `BootFilesPath` directory and `KerenelDirect` field. However, if `BootFilesPath` is subsequently updated, those fields are not updated. This can result in inconsistent behavior, where (depending on if the default `BootFilesPath` contains `vmlinux` and `rootfs.vhd` files), a uVM created with an overridden `BootFilesPath` may either use `initrd` (`kernel`) or `vmlinux` (`rootfs.vhd`), respectively. Add a `UpdateBootFilesPath` function to consistently change the `BootFilesPath` and associated options. Update annotation handling to use `UpdateBootFilesPath`. Security policy is still performed after the update, so settings will be re-overridden for the confidential case, or by other annotations, so existing (normal) behavior is persisted. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
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.
NewDefaultOptionsLCOWsetsRootFSFileandKernelFiledepending on the contents of the (default)BootFilesPathdirectory andKerenelDirectfield.However, if
BootFilesPathis subsequently updated, those fields are not updated.This can result in inconsistent behavior, where (depending on if the default
BootFilesPathcontainsvmlinuxandrootfs.vhdfiles), a uVM created with an overriddenBootFilesPathmay either useinitrd(kernel) orvmlinux(rootfs.vhd), respectively.Add a
UpdateBootFilesPathfunction to consistently change theBootFilesPathand associated options.Update annotation handling to use
UpdateBootFilesPath. Security policy is still performed after the update, so settings will be re-overridden for the confidential case, or by other annotations, so existing (normal) behavior is persisted.