Skip to content
Open
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
2 changes: 1 addition & 1 deletion core/unix/os.c
Original file line number Diff line number Diff line change
Expand Up @@ -10245,7 +10245,7 @@ os_walk_address_space(memquery_iter_t *iter, bool add_modules)
/* we already added the whole image region when we hit the first map for it */
image = true;
DODEBUG({ map_type = "ELF SO"; });
} else if (TEST(MEMPROT_READ, iter->prot) &&
} else if (TEST(MEMPROT_READ | MEMPROT_EXEC, iter->prot) &&
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the consensus in the other comment thread was to add this MEMPROT_EXEC check to L10288 (the line #s have changed now it seems; maybe because the force-push also updated the branch baseline?). Like I said, by doing that, we can avoid making any assumption about the anon region case (see L10289).

Does this solve your crash?

module_is_header(iter->vm_start, size)) {
DEBUG_DECLARE(size_t image_size = size;)
app_pc mod_base, mod_first_end, mod_max_end;
Expand Down
Loading