Skip to content

Fixup loader. Actually pass path, restore when entry() returns #21

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.

Sign up for GitHub

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

Merged
tobhe merged 1 commit into from
Aug 21, 2025
Merged

Fixup loader. Actually pass path, restore when entry() returns #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ EFI_STATUS linux_exec(
const struct iovec *kernel,
const struct iovec *initrd) {

EFI_LOADED_IMAGE_PROTOCOL original_parent_loaded_image;
size_t kernel_size_in_memory = 0;
uint32_t entry_point;
uint64_t image_base;
Expand Down Expand Up @@ -97,6 +98,8 @@ EFI_STATUS linux_exec(
kernel_file_path->end_path.SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE;
kernel_file_path->end_path.Length = sizeof (EFI_DEVICE_PATH);

original_parent_loaded_image = *parent_loaded_image;
parent_loaded_image->FilePath = &kernel_file_path->memmap_path.Header;
parent_loaded_image->ImageBase = loaded_kernel;
parent_loaded_image->ImageSize = kernel_size_in_memory;

Expand All @@ -116,5 +119,8 @@ EFI_STATUS linux_exec(
(EFI_IMAGE_ENTRY_POINT) ((const uint8_t *) parent_loaded_image->ImageBase + entry_point);
err = entry(parent_image, ST);

/* Restore */
*parent_loaded_image = original_parent_loaded_image;

return log_error_status(err, "Error starting kernel image: %m");
}