Skip to content

chore: mark ElfLoader::load as unsafe #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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: mark ElfLoader::load as unsafe #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a15ec
chore: mark `ElfLoader::load` as unsafe
toku-sa-n Jun 13, 2021
61c469a
fix: test
toku-sa-n Jun 13, 2021
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
28 changes: 20 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,13 @@ pub trait ElfLoader {
fn allocate(&mut self, load_headers: LoadableHeaders) -> Result<(), ElfLoaderErr>;

/// Copies `region` into memory starting at `base`.
/// The caller makes sure that there was an `allocate` call previously
///
/// # Safety
///
/// The caller must ensure that there was an `allocate` call previously
/// to initialize the region.
fn load(&mut self, flags: Flags, base: VAddr, region: &[u8]) -> Result<(), ElfLoaderErr>;
unsafe fn load(&mut self, flags: Flags, base: VAddr, region: &[u8])
-> Result<(), ElfLoaderErr>;

/// Request for the client to relocate the given `entry`
/// within the loaded ELF file.
Expand Down Expand Up @@ -465,11 +469,14 @@ impl<'s> ElfBinary<'s> {
if let Ph64(header) = p {
let typ = header.get_type()?;
if typ == Type::Load {
loader.load(
header.flags,
header.virtual_addr,
header.raw_data(&self.file),
)?;
// SAFETY: Yes, `loader.allocate(load_iter)?;` allocates memory.
unsafe {
loader.load(
header.flags,
header.virtual_addr,
header.raw_data(&self.file),
)?;
}
} else if typ == Type::Tls {
loader.tls(
header.virtual_addr,
Expand Down Expand Up @@ -585,7 +592,12 @@ mod test {
}
}

fn load(&mut self, _flags: Flags, base: VAddr, region: &[u8]) -> Result<(), ElfLoaderErr> {
unsafe fn load(
&mut self,
_flags: Flags,
base: VAddr,
region: &[u8],
) -> Result<(), ElfLoaderErr> {
info!("load base = {:#x} size = {:#x} region", base, region.len());
self.actions.push(LoaderAction::Load(base, region.len()));
Ok(())
Expand Down