Skip to content
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.

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

Refine munmap logic to better align with POSIX specification #1489

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions qiling/os/posix/syscall/mman.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
def ql_syscall_munmap(ql: Qiling, addr: int, length: int):
try:
# find addr's enclosing memory range
label = next(label for lbound, ubound, _, label, _ in ql.mem.get_mapinfo() if (lbound <= addr < ubound) and label.startswith(('[mmap]', '[mmap anonymous]')))
ubound, label = next((ubound, label) for lbound, ubound, _, label, _ in ql.mem.get_mapinfo() if (lbound <= addr < ubound) and label.startswith(('[mmap]', '[mmap anonymous]')))
except StopIteration:
# nothing to do; cannot munmap what was not originally mmapped
ql.log.debug(f'munmap: enclosing area for {addr:#x} was not mmapped')
Expand All @@ -43,9 +43,10 @@ def ql_syscall_munmap(ql: Qiling, addr: int, length: int):
fd.lseek(fd._mapped_offset)
fd.write(content)

# unmap the enclosing memory region
# unmap the enclosing memory pages.
# munmap allows the length to exceed the mapped range. in such case, unmap by original ubound
lbound = ql.mem.align(addr)
ubound = ql.mem.align_up(addr + length)
ubound = min(ql.mem.align_up(addr + length), ubound)

ql.mem.unmap(lbound, ubound - lbound)

Expand Down
Loading