Skip to content
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
10 changes: 6 additions & 4 deletions internal/static/duplicate_darwin_arm64.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,16 @@ func patchRodataCodePtrs(offset uintptr, moddata *moduledata) error {
}
}

_, err = mach.VmRemap(mapStart, uintptr(tmpPtr), size)
err = unix.Mprotect(tmpSlice, unix.PROT_READ|unix.PROT_EXEC)
if err != nil {
unix.MunmapPtr(tmpPtr, size)
return fmt.Errorf("vm_remap rodata (%d bytes at %#x): %w", size, mapStart, err)
return fmt.Errorf("mprotect temp to r-x: %w", err)
}

if err := unix.Mprotect(unsafe.Slice((*byte)(unsafe.Pointer(mapStart)), int(size)), unix.PROT_READ); err != nil {
return fmt.Errorf("mprotect rodata to r: %w", err)
_, err = mach.VmRemap(mapStart, uintptr(tmpPtr), size)
if err != nil {
unix.MunmapPtr(tmpPtr, size)
return fmt.Errorf("vm_remap rodata (%d bytes at %#x): %w", size, mapStart, err)
}

unix.MunmapPtr(tmpPtr, size)
Expand Down
Loading