Skip to content

i#7962: Fix elfutils crash #7963

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

Merged
derekbruening merged 3 commits into from
Jun 23, 2026
+12 −4
Merged

i#7962: Fix elfutils crash #7963

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
362e7d7
i#7962: Fix elfutils crash
derekbruening Jun 23, 2026
318d9e4
Do not map writable on Windows
derekbruening Jun 23, 2026
f8ba887
Preserve read permission when adding write
derekbruening Jun 23, 2026
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
16 changes: 12 additions & 4 deletions ext/drsyms/drsyms_unix_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2011-2025 Google, Inc. All rights reserved.
* Copyright (c) 2011-2026 Google, Inc. All rights reserved.
* **********************************************************/

/*
Expand Down Expand Up @@ -130,8 +130,16 @@ load_module(const char *modpath)
mod->file_size = (size_t)file_size; /* XXX: ignoring truncation */

mod->map_size = mod->file_size;
int map_prot = DR_MEMPROT_READ;
#ifndef WINDOWS
/* Map as copy-on-write so that elfutils can directly write for cases like
* compressed sections. This avoids requiring a separate allocation (and
* patching elfutils to support that use case).
*/
map_prot |= DR_MEMPROT_WRITE;
#endif
mod->map_base =
dr_map_file(mod->fd, &mod->map_size, 0, NULL, DR_MEMPROT_READ, DR_MAP_PRIVATE);
dr_map_file(mod->fd, &mod->map_size, 0, NULL, map_prot, DR_MAP_PRIVATE);
/* map_size can be larger than file_size */
if (mod->map_base == NULL || mod->map_size < mod->file_size) {
NOTIFY("%s: unable to map %s\n", __FUNCTION__, modpath);
Expand Down Expand Up @@ -191,13 +199,13 @@ load_module(const char *modpath)
dwarf_lib_handle_t dbg;
/* If there is no .gnu_debuglink, initialize parsing. */
#ifdef WINDOWS
/* i#1395: support switching to expots-only for MinGW, for which we
/* i#1395: support switching to exports-only for MinGW, for which we
* need an image mapping. We don't need the file mapping anymore.
*/
if (drsym_obj_remap_as_image(mod->obj_info)) {
dr_unmap_file(mod->map_base, mod->map_size);
mod->map_size = 0;
mod->map_base = dr_map_file(mod->fd, &mod->map_size, 0, NULL, DR_MEMPROT_READ,
mod->map_base = dr_map_file(mod->fd, &mod->map_size, 0, NULL, map_prot,
DR_MAP_PRIVATE | DR_MAP_IMAGE);
if (mod->map_base == NULL || mod->map_size < mod->file_size) {
NOTIFY("%s: unable to map %s\n", __FUNCTION__, modpath);
Expand Down
Loading