This is an archive of the discontinued LLVM Phabricator instance.

Differential D112810

[sanitizer_common] Fix Posix/mmap_write_exec.cpp on 32-bit Solaris
ClosedPublic

Authored by ro on Oct 29 2021, 5:18 AM.

Details

Reviewers
devnexen
vitalybuka
Commits
rG2f353c040f32: [sanitizer_common] Fix Posix/mmap_write_exec.cpp on 32-bit Solaris
Summary

The new Posix/mmap_write_exec.cpp test FAILs on 32-bit Solaris/x86. This happens
because only mmap is intercepted, but not mmap64 which is used for largefile support.

Fixed by also intercepting mmap64.

Tested on amd64-pc-solaris2.11.

Diff Detail

Event Timeline

ro created this revision.Oct 29 2021, 5:18 AM
Herald added subscribers: pengfei, fedor.sergeev. · View Herald TranscriptOct 29 2021, 5:18 AM
ro requested review of this revision.Oct 29 2021, 5:18 AM
Herald added a subscriber: Restricted Project. · View Herald TranscriptOct 29 2021, 5:18 AM
devnexen accepted this revision.Oct 29 2021, 5:27 AM

LGTM

This revision is now accepted and ready to land.Oct 29 2021, 5:27 AM
This revision was landed with ongoing or failed builds.Oct 29 2021, 5:30 AM
Closed by commit rG2f353c040f32: [sanitizer_common] Fix Posix/mmap_write_exec.cpp on 32-bit Solaris (authored by ro). · Explain Why
This revision was automatically updated to reflect the committed changes.
ro added a commit: rG2f353c040f32: [sanitizer_common] Fix Posix/mmap_write_exec.cpp on 32-bit Solaris.
Harbormaster completed remote builds in B131404: Diff 383321.Oct 29 2021, 5:33 AM

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
2 lines

Diff 383323

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

Show First 20 Lines • Show All 474 Lines • ▼ Show 20 Lines#define SANITIZER_INTERCEPT_UTMP \
(SI_POSIX && !SI_MAC && !SI_FREEBSD && !SI_NETBSD) (SI_POSIX && !SI_MAC && !SI_FREEBSD && !SI_NETBSD)
#define SANITIZER_INTERCEPT_UTMPX \ #define SANITIZER_INTERCEPT_UTMPX \
(SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD) (SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD)
#define SANITIZER_INTERCEPT_GETLOADAVG \ #define SANITIZER_INTERCEPT_GETLOADAVG \
(SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD) (SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD)
#define SANITIZER_INTERCEPT_MMAP SI_POSIX #define SANITIZER_INTERCEPT_MMAP SI_POSIX
#define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_MMAP64 SI_LINUX_NOT_ANDROID || SI_SOLARIS
#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (SI_GLIBC || SI_ANDROID) #define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (SI_GLIBC || SI_ANDROID)
#define SANITIZER_INTERCEPT_MEMALIGN (!SI_FREEBSD && !SI_MAC && !SI_NETBSD) #define SANITIZER_INTERCEPT_MEMALIGN (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
#define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC #define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC
#define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC || SI_ANDROID) #define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC || SI_ANDROID)
#define SANITIZER_INTERCEPT_CFREE (SI_GLIBC && !SANITIZER_RISCV64) #define SANITIZER_INTERCEPT_CFREE (SI_GLIBC && !SANITIZER_RISCV64)
#define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX #define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX
#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC) #define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC)
#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD) #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)
▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines