diff options
| author | Alec Fessler <afessler1998@gmail.com> | 2025-02-22 15:07:44 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2025-02-24 04:36:14 -0500 |
| commit | 1cc388d5263058f9e9eecc410eea825a9a58e143 (patch) | |
| tree | 90a02eaeeb263bd175a9525fd27e16d8eb269acb /lib | |
| parent | ecc76348e6858f00b920d8dc9e44a6e703d8e497 (diff) | |
| download | zig-1cc388d5263058f9e9eecc410eea825a9a58e143.tar.gz zig-1cc388d5263058f9e9eecc410eea825a9a58e143.zip | |
stdlib: handle EEXIST in mmap with FIXED_NOREPLACE. Fixes #21475
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/Thread.zig | 1 | ||||
| -rw-r--r-- | lib/std/debug/Dwarf.zig | 7 | ||||
| -rw-r--r-- | lib/std/posix.zig | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig index eaf136d0eb..27b2b11c4a 100644 --- a/lib/std/Thread.zig +++ b/lib/std/Thread.zig @@ -1420,6 +1420,7 @@ const LinuxThreadImpl = struct { error.PermissionDenied => unreachable, error.ProcessFdQuotaExceeded => unreachable, error.SystemFdQuotaExceeded => unreachable, + error.MappingAlreadyExists => unreachable, else => |e| return e, }; assert(mapped.len >= map_bytes); diff --git a/lib/std/debug/Dwarf.zig b/lib/std/debug/Dwarf.zig index b72ddcac47..e5d47ba491 100644 --- a/lib/std/debug/Dwarf.zig +++ b/lib/std/debug/Dwarf.zig @@ -2434,14 +2434,17 @@ pub const ElfModule = struct { const end_pos = elf_file.getEndPos() catch return bad(); const file_len = cast(usize, end_pos) orelse return error.Overflow; - const mapped_mem = try std.posix.mmap( + const mapped_mem = std.posix.mmap( null, file_len, std.posix.PROT.READ, .{ .TYPE = .SHARED }, elf_file.handle, 0, - ); + ) catch |err| switch (err) { + error.MappingAlreadyExists => unreachable, + else => |e| return e, + }; errdefer std.posix.munmap(mapped_mem); return load( diff --git a/lib/std/posix.zig b/lib/std/posix.zig index 3c7893e267..c07d6e6f0d 100644 --- a/lib/std/posix.zig +++ b/lib/std/posix.zig @@ -4754,6 +4754,9 @@ pub const MMapError = error{ ProcessFdQuotaExceeded, SystemFdQuotaExceeded, OutOfMemory, + + /// Using FIXED_NOREPLACE flag and the process has already mapped memory at the given address + MappingAlreadyExists, } || UnexpectedError; /// Map files or devices into memory. @@ -4792,6 +4795,7 @@ pub fn mmap( .MFILE => return error.ProcessFdQuotaExceeded, .NFILE => return error.SystemFdQuotaExceeded, .NOMEM => return error.OutOfMemory, + .EXIST => return error.MappingAlreadyExists, else => return unexpectedErrno(err), } } |