Skip to content

[tests]: Move values of setup_header on stack #140

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[tests]: Move values of setup_header on stack #140

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
19 changes: 6 additions & 13 deletions src/loader/x86_64/bzimage/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,20 +238,16 @@ mod tests {
)
.unwrap();
let setup_header = loader_result.setup_header.unwrap();
let header = setup_header.header;
let version = setup_header.version;

assert_eq!(loader_result.kernel_load.raw_value(), 0x200000);
assert_eq!(
// SAFETY:
// Reading the value from an unaligned address is not considered safe.
// but this is not an issue since this is a test.
unsafe { std::ptr::addr_of!(setup_header.header).read_unaligned() },
header,
0x53726448
);
assert_eq!(
// SAFETY:
// Reading the value from an unaligned address is not considered safe.
// but this is not an issue since this is a test.
unsafe { std::ptr::addr_of!(setup_header.version).read_unaligned() },
version,
0x20d
);
assert_eq!(loader_result.setup_header.unwrap().loadflags, 1);
Expand All @@ -266,18 +262,15 @@ mod tests {
)
.unwrap();
let setup_header = loader_result.setup_header.unwrap();
let header = setup_header.header;

assert_eq!(loader_result.kernel_load.raw_value(), 0x100000);

// load bzImage without himem_start
loader_result = BzImage::load(&gm, None, &mut Cursor::new(&image), None).unwrap();
// Reading the value from an unaligned address is not considered safe.
assert_eq!(
0x53726448,
// SAFETY:
// Reading the value from an unaligned address is not considered safe.
// but this is not an issue since this is a test.
unsafe { std::ptr::addr_of!(setup_header.header).read_unaligned() }
header
);
assert_eq!(loader_result.kernel_load.raw_value(), 0x100000);

Expand Down