Skip to content

fixed issue when file size < data size but (data size) - (file size) … #3

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: master
Choose a base branch
from
Open

fixed issue when file size < data size but (data size) - (file size) … #3

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
13 changes: 11 additions & 2 deletions loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,26 @@ static bool map_load_segments(elf_file_t * info, char ** out_base) {
size_t offset_page = FLOOR2(cur->p_offset, PAGE_SIZE);
size_t align_diff = cur->p_vaddr - vaddr_page;

size_t filesz_page = CEIL2(align_diff + cur->p_filesz, PAGE_SIZE);
size_t real_filesz = align_diff + cur->p_filesz;
size_t filesz_page = CEIL2(real_filesz, PAGE_SIZE);
size_t memsz_page = CEIL2(align_diff + cur->p_memsz, PAGE_SIZE);

int mmap_prot = (align_diff > 0 ? PROT_READ | PROT_WRITE : prot);
int mmap_prot = ((align_diff > 0)|(real_filesz < filesz_page) ? PROT_READ | PROT_WRITE : prot);

char * map = (char *)mmap(base + vaddr_page, filesz_page, mmap_prot, MAP_FIXED | MAP_PRIVATE, info->fd, offset_page);
if (map == MAP_FAILED) {
ERROR(load, "Failed to map program header %d (mapped from file)\n", i);
goto fail;
}

if(real_filesz < filesz_page){
memset(map+real_filesz, 0, filesz_page-real_filesz);
if (prot != mmap_prot && mprotect(map, filesz_page, prot) == -1){
ERROR(load, "Failed to reprotect program header %d (mapped from file)\n", i);
goto fail;
}
}

if (align_diff > 0) {
memset(map, 0, align_diff);
if (prot != mmap_prot && mprotect(map, align_diff + cur->p_memsz, prot) == -1) {
Expand Down