mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdlib: handle EEXIST in mmap with FIXED_NOREPLACE. Fixes #21475

Browse Source
This commit is contained in:
Alec Fessler 2025-02-22 15:07:44 -05:00 committed by Andrew Kelley
parent ecc76348e6
commit 1cc388d526
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/std/Thread.zig
View File

@ -1420,6 +1420,7 @@ const LinuxThreadImpl = struct {
error.PermissionDenied => unreachable, error.PermissionDenied => unreachable,
error.ProcessFdQuotaExceeded => unreachable, error.ProcessFdQuotaExceeded => unreachable,
error.SystemFdQuotaExceeded => unreachable, error.SystemFdQuotaExceeded => unreachable,
error.MappingAlreadyExists => unreachable,
else => |e| return e, else => |e| return e,
}; };
assert(mapped.len >= map_bytes); assert(mapped.len >= map_bytes);

7
lib/std/debug/Dwarf.zig
View File

@ -2434,14 +2434,17 @@ pub const ElfModule = struct {
const end_pos = elf_file.getEndPos() catch return bad(); const end_pos = elf_file.getEndPos() catch return bad();
const file_len = cast(usize, end_pos) orelse return error.Overflow; 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, null,
file_len, file_len,
std.posix.PROT.READ, std.posix.PROT.READ,
.{ .TYPE = .SHARED }, .{ .TYPE = .SHARED },
elf_file.handle, elf_file.handle,
0, 0,
); ) catch |err| switch (err) {
error.MappingAlreadyExists => unreachable,
else => |e| return e,
};
errdefer std.posix.munmap(mapped_mem); errdefer std.posix.munmap(mapped_mem);
return load( return load(

4
lib/std/posix.zig
View File

@ -4754,6 +4754,9 @@ pub const MMapError = error{
ProcessFdQuotaExceeded, ProcessFdQuotaExceeded,
SystemFdQuotaExceeded, SystemFdQuotaExceeded,
OutOfMemory, OutOfMemory,
/// Using FIXED_NOREPLACE flag and the process has already mapped memory at the given address
MappingAlreadyExists,
} || UnexpectedError; } || UnexpectedError;
/// Map files or devices into memory. /// Map files or devices into memory.
@ -4792,6 +4795,7 @@ pub fn mmap(
.MFILE => return error.ProcessFdQuotaExceeded, .MFILE => return error.ProcessFdQuotaExceeded,
.NFILE => return error.SystemFdQuotaExceeded, .NFILE => return error.SystemFdQuotaExceeded,
.NOMEM => return error.OutOfMemory, .NOMEM => return error.OutOfMemory,
.EXIST => return error.MappingAlreadyExists,
else => return unexpectedErrno(err), else => return unexpectedErrno(err),
} }
} }