This is an archive of the discontinued LLVM Phabricator instance.

Differential D125901

[safestack] Fix Mmap on FreeBSD AArch64
ClosedPublic

Authored by andrew on May 18 2022, 9:20 AM.

Details

Reviewers
vitalybuka
MaskRay
Group Reviewers
Restricted Project
Commits
rGccae01cbce8a: [compiler-rt] Fix Mmap on FreeBSD AArch64
Summary

On FreeBSD AArch64 safestack needs to use __syscall to handle 64 bit arguments

Diff Detail

Event Timeline

andrew created this revision.May 18 2022, 9:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 18 2022, 9:20 AM
Herald added subscribers: kristof.beyls, krytarowski, arichardson. · View Herald Transcript
andrew requested review of this revision.May 18 2022, 9:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 18 2022, 9:20 AM
andrew added a parent revision: D125756: [sanitizer] Add the common FreeBSD AArch64 support.May 18 2022, 9:22 AM
Harbormaster completed remote builds in B165147: Diff 430409.May 18 2022, 9:43 AM
vitalybuka accepted this revision.May 19 2022, 6:20 PM
This revision is now accepted and ready to land.May 19 2022, 6:20 PM
MaskRay accepted this revision.May 19 2022, 6:46 PM
MaskRay added a subscriber: MaskRay.

I think placing the OS before && is more common.

compiler-rt/lib/safestack/safestack_platform.h
97
Herald added a subscriber: StephenFan. · View Herald TranscriptMay 19 2022, 6:46 PM
Closed by commit rGccae01cbce8a: [compiler-rt] Fix Mmap on FreeBSD AArch64 (authored by andrew, committed by emaste). · Explain WhyJun 8 2022, 2:23 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rGccae01cbce8a: [compiler-rt] Fix Mmap on FreeBSD AArch64.
Herald added a subscriber: Enna1. · View Herald TranscriptJun 8 2022, 2:23 PM

Revision Contents

PathSize
compiler-rt/
lib/
safestack/
2 lines

Diff 435330

compiler-rt/lib/safestack/safestack_platform.h

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines#else
return syscall(SYS_tgkill, pid, tid, sig); return syscall(SYS_tgkill, pid, tid, sig);
#endif #endif
} }
inline void *Mmap(void *addr, size_t length, int prot, int flags, int fd, inline void *Mmap(void *addr, size_t length, int prot, int flags, int fd,
off_t offset) { off_t offset) {
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
return __mmap(addr, length, prot, flags, fd, 0, offset); return __mmap(addr, length, prot, flags, fd, 0, offset);
#elif defined(__x86_64__) && (SANITIZER_FREEBSD) #elif SANITIZER_FREEBSD && (defined(__aarch64__) || defined(__x86_64__))
MaskRayUnsubmitted
Not Done
ReplyInline Actions
return __mmap(addr, length, prot, flags, fd, 0, offset);
- #elif (defined(__aarch64__) || defined(__x86_64__)) && (SANITIZER_FREEBSD)
+ #elif SANITIZER_FREEBSD && (defined(__aarch64__) || defined(__x86_64__))
return (void *)__syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
MaskRay:
return (void *)__syscall(SYS_mmap, addr, length, prot, flags, fd, offset); return (void *)__syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
#else #else
return (void *)syscall(SYS_mmap, addr, length, prot, flags, fd, offset); return (void *)syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
#endif #endif
} }
inline int Munmap(void *addr, size_t length) { inline int Munmap(void *addr, size_t length) {
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
Show All 19 Lines