Skip to content

[sanitizer_common] Implement address sanitizer on AIX: platform specific support #131866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
+200 −91
Open

[sanitizer_common] Implement address sanitizer on AIX: platform specific support #131866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
829ed78
[sanitizer_common] recognize AIX
jakeegan Mar 14, 2025
075dd32
Fix formatting
jakeegan Apr 1, 2025
5040523
Fix formatting 2
jakeegan Apr 1, 2025
d994b0a
Add general asan part
jakeegan Apr 22, 2025
6bc803e
Fix xdr.h path
jakeegan Apr 24, 2025
ada3b70
Fix merge resolution
jakeegan Apr 27, 2025
8641fca
Add missing #
jakeegan Apr 28, 2025
35db409
Resolve build fail
jakeegan Apr 28, 2025
f5ce2a7
Add TryReExecWithoutASLR stub
jakeegan Apr 28, 2025
12653e1
enable_unmalloced_free_check
jakeegan Apr 29, 2025
26bf8fe
Fix formatting
jakeegan Apr 29, 2025
cc252b9
Fix formatting
jakeegan Apr 29, 2025
b42ddff
Fix formatting..
jakeegan Apr 29, 2025
d9b56c0
Move code from other PR
jakeegan Apr 30, 2025
9603601
Move code to new PR
jakeegan May 8, 2025
20074e3
Move code
jakeegan May 12, 2025
af8e774
Trigger PR refresh
jakeegan May 13, 2025
d797a87
Move code to new PR
jakeegan May 13, 2025
5e4dc56
Merge branch 'main' into asan_common1
jakeegan Jun 24, 2025
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
6 changes: 5 additions & 1 deletion compiler-rt/cmake/base-config-ix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ include(CompilerRTDarwinUtils)
check_include_file(unwind.h HAVE_UNWIND_H)

# Used by sanitizer_common and tests.
check_include_file(rpc/xdr.h HAVE_RPC_XDR_H)
if (${CMAKE_SYSTEM_NAME} MATCHES AIX)
check_include_file(tirpc/rpc/xdr.h HAVE_RPC_XDR_H)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not specific to this patch: I am a bit concerned about this. If the CI or build system does not have this header, then changes that break the correspondence in layout would not be identified.

A separate patch should be posted to require the presence of this header (with an opt-out via CMake option). @vitalybuka, what process would you advise in terms of giving advance warning for buildbot maintainers?

else()
check_include_file(rpc/xdr.h HAVE_RPC_XDR_H)
endif()
if (NOT HAVE_RPC_XDR_H)
set(HAVE_RPC_XDR_H 0)
endif()
Expand Down
2 changes: 2 additions & 0 deletions compiler-rt/lib/sanitizer_common/sanitizer_errno.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
# define __errno_location _errno
#elif SANITIZER_HAIKU
# define __errno_location _errnop
#elif SANITIZER_AIX
# define __errno_location _Errno
#endif

extern "C" int *__errno_location();
Expand Down
14 changes: 11 additions & 3 deletions compiler-rt/lib/sanitizer_common/sanitizer_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
!defined(__APPLE__) && !defined(_WIN32) && !defined(__Fuchsia__) && \
!(defined(__sun__) && defined(__svr4__)) && !defined(__HAIKU__) && \
!defined(__wasi__)
!defined(__wasi__) && !defined(_AIX)
# error "This operating system is not supported"
#endif

Expand All @@ -32,6 +32,12 @@
# define SANITIZER_LINUX 0
#endif

#if defined(_AIX)
# define SANITIZER_AIX 1
#else
# define SANITIZER_AIX 0
#endif

#if defined(__GLIBC__)
# define SANITIZER_GLIBC 1
#else
Expand Down Expand Up @@ -151,7 +157,7 @@

#define SANITIZER_POSIX \
(SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_APPLE || \
SANITIZER_NETBSD || SANITIZER_SOLARIS || SANITIZER_HAIKU)
SANITIZER_NETBSD || SANITIZER_SOLARIS || SANITIZER_HAIKU || SANITIZER_AIX)

#if __LP64__ || defined(_WIN64)
# define SANITIZER_WORDSIZE 64
Expand Down Expand Up @@ -405,7 +411,9 @@
// (ie. same as double) to 128-bit long double. On those, glibc symbols
// involving long doubles come in two versions, and we need to pass the
// correct one to dlvsym when intercepting them.
#if SANITIZER_LINUX && (SANITIZER_S390 || SANITIZER_PPC32 || SANITIZER_PPC64V1)
#if SANITIZER_LINUX && \
(SANITIZER_S390 || (SANITIZER_PPC32 && !SANITIZER_AIX) || \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change necessary? SANITIZER_LINUX is not set at the same time as SANITIZER_AIX, right?

SANITIZER_PPC64V1)
# define SANITIZER_NLDBL_VERSION "GLIBC_2.4"
#endif

Expand Down
118 changes: 77 additions & 41 deletions compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// Must go after undef _FILE_OFFSET_BITS.
#include "sanitizer_platform.h"

#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe sanitizer_platform_limits_aix.cpp ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why though? AIX is a POSIX platform and the logic (and structure) here seems to be common except for the usual type/structure size/layout differences.

#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU || SANITIZER_AIX
// Must go after undef _FILE_OFFSET_BITS.
#include "sanitizer_glibc_version.h"

Expand Down Expand Up @@ -61,11 +61,11 @@
#endif

#if !SANITIZER_ANDROID
#if !SANITIZER_HAIKU
#include <sys/mount.h>
#endif
#include <sys/timeb.h>
#include <utmpx.h>
# if !SANITIZER_AIX && !SANITIZER_HAIKU
# include <sys/mount.h>
# endif
# include <sys/timeb.h>
# include <utmpx.h>
#endif

#if SANITIZER_LINUX
Expand Down Expand Up @@ -112,11 +112,15 @@ typedef struct user_fpregs elf_fpregset_t;
#endif

#if !SANITIZER_ANDROID
#include <ifaddrs.h>
#if !SANITIZER_HAIKU
#include <sys/ucontext.h>
#include <wordexp.h>
#endif
# if !SANITIZER_AIX
# include <ifaddrs.h>
# else
# include <netinet/in.h>
# endif
# if !SANITIZER_HAIKU
# include <sys/ucontext.h>
# include <wordexp.h>
# endif
#endif

#if SANITIZER_LINUX
Expand Down Expand Up @@ -177,10 +181,21 @@ typedef struct user_fpregs elf_fpregset_t;
#include <sys/sockio.h>
#endif

#if SANITIZER_HAIKU
#include <sys/sockio.h>
#include <sys/ioctl.h>
#endif
# if SANITIZER_AIX
# include <netinet/ip_mroute.h>
# include <stropts.h>
# include <sys/ioctl.h>
# include <sys/statfs.h>
# include <unistd.h>
# if HAVE_RPC_XDR_H
# include <tirpc/rpc/xdr.h>
# endif
# endif

# if SANITIZER_HAIKU
# include <sys/ioctl.h>
# include <sys/sockio.h>
# endif

// Include these after system headers to avoid name clashes and ambiguities.
# include "sanitizer_common.h"
Expand Down Expand Up @@ -557,14 +572,45 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);

const unsigned IOCTL_NOT_PRESENT = 0;

// On AIX, some variables are unsigned long types.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The vertical separation and intermixing between the changes here is not in a good shape for review.

Suggestion:

Add

#if SANITIZER_AIX
using ioctl_alttype = uptr;
#else
using ioctl_alttype = unsigned;
#endif

and change the specific lines affected by replacing unsigned with ioctl_alttype.

# if SANITIZER_AIX
uptr IOCTL_FIOASYNC = FIOASYNC;
uptr IOCTL_FIONBIO = FIONBIO;
uptr IOCTL_FIOSETOWN = FIOSETOWN;
uptr IOCTL_SIOCSPGRP = SIOCSPGRP;
uptr IOCTL_TIOCCONS = TIOCCONS;
uptr IOCTL_TIOCMBIC = TIOCMBIC;
uptr IOCTL_TIOCMBIS = TIOCMBIS;
uptr IOCTL_TIOCMSET = TIOCMSET;
uptr IOCTL_TIOCPKT = TIOCPKT;
uptr IOCTL_TIOCSETD = TIOCSETD;
uptr IOCTL_TIOCSPGRP = TIOCSPGRP;
uptr IOCTL_TIOCSTI = TIOCSTI;
uptr IOCTL_TIOCSWINSZ = TIOCSWINSZ;
# else
unsigned IOCTL_FIONBIO = FIONBIO;
#if !SANITIZER_HAIKU
# if !SANITIZER_HAIKU
unsigned IOCTL_FIOASYNC = FIOASYNC;
unsigned IOCTL_FIOSETOWN = FIOSETOWN;
unsigned IOCTL_TIOCCONS = TIOCCONS;
unsigned IOCTL_TIOCPKT = TIOCPKT;
unsigned IOCTL_TIOCSETD = TIOCSETD;
unsigned IOCTL_TIOCSTI = TIOCSTI;
# endif
unsigned IOCTL_SIOCSPGRP = SIOCSPGRP;
unsigned IOCTL_TIOCMBIC = TIOCMBIC;
unsigned IOCTL_TIOCMBIS = TIOCMBIS;
unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
unsigned IOCTL_TIOCMSET = TIOCMSET;
unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
# endif
# if !SANITIZER_HAIKU
unsigned IOCTL_FIOCLEX = FIOCLEX;
unsigned IOCTL_FIOGETOWN = FIOGETOWN;
unsigned IOCTL_FIONCLEX = FIONCLEX;
unsigned IOCTL_FIOSETOWN = FIOSETOWN;
#endif
unsigned IOCTL_TIOCGETD = TIOCGETD;
unsigned IOCTL_TIOCNOTTY = TIOCNOTTY;
# endif
unsigned IOCTL_SIOCADDMULTI = SIOCADDMULTI;
unsigned IOCTL_SIOCATMARK = SIOCATMARK;
unsigned IOCTL_SIOCDELMULTI = SIOCDELMULTI;
Expand All @@ -584,30 +630,17 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
unsigned IOCTL_SIOCSIFMETRIC = SIOCSIFMETRIC;
unsigned IOCTL_SIOCSIFMTU = SIOCSIFMTU;
unsigned IOCTL_SIOCSIFNETMASK = SIOCSIFNETMASK;
unsigned IOCTL_SIOCSPGRP = SIOCSPGRP;

#if !SANITIZER_HAIKU
unsigned IOCTL_TIOCCONS = TIOCCONS;
unsigned IOCTL_TIOCGETD = TIOCGETD;
unsigned IOCTL_TIOCNOTTY = TIOCNOTTY;
unsigned IOCTL_TIOCPKT = TIOCPKT;
unsigned IOCTL_TIOCSETD = TIOCSETD;
unsigned IOCTL_TIOCSTI = TIOCSTI;
#endif

unsigned IOCTL_TIOCEXCL = TIOCEXCL;
unsigned IOCTL_TIOCGPGRP = TIOCGPGRP;
unsigned IOCTL_TIOCGWINSZ = TIOCGWINSZ;
unsigned IOCTL_TIOCMBIC = TIOCMBIC;
unsigned IOCTL_TIOCMBIS = TIOCMBIS;
unsigned IOCTL_TIOCMGET = TIOCMGET;
unsigned IOCTL_TIOCMSET = TIOCMSET;
unsigned IOCTL_TIOCNXCL = TIOCNXCL;
unsigned IOCTL_TIOCOUTQ = TIOCOUTQ;
# if !SANITIZER_AIX
unsigned IOCTL_TIOCSCTTY = TIOCSCTTY;
unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
#if SANITIZER_LINUX && !SANITIZER_ANDROID
# endif
# if SANITIZER_LINUX && !SANITIZER_ANDROID
unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
#endif
Expand Down Expand Up @@ -1003,8 +1036,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);

const int si_SEGV_MAPERR = SEGV_MAPERR;
const int si_SEGV_ACCERR = SEGV_ACCERR;
} // namespace __sanitizer

} // namespace __sanitizer
using namespace __sanitizer;

COMPILER_CHECK(sizeof(__sanitizer_pthread_attr_t) >= sizeof(pthread_attr_t));
Expand Down Expand Up @@ -1115,11 +1147,13 @@ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
CHECK_SIZE_AND_OFFSET(dirent, d_ino);
#if SANITIZER_APPLE
CHECK_SIZE_AND_OFFSET(dirent, d_seekoff);
#elif SANITIZER_FREEBSD || SANITIZER_HAIKU
# elif SANITIZER_AIX
CHECK_SIZE_AND_OFFSET(dirent, d_offset);
# elif SANITIZER_FREEBSD || SANITIZER_HAIKU
// There is no 'd_off' field on FreeBSD.
#else
# else
CHECK_SIZE_AND_OFFSET(dirent, d_off);
#endif
# endif
CHECK_SIZE_AND_OFFSET(dirent, d_reclen);

#if SANITIZER_GLIBC
Expand Down Expand Up @@ -1205,10 +1239,12 @@ CHECK_SIZE_AND_OFFSET(tm, tm_year);
CHECK_SIZE_AND_OFFSET(tm, tm_wday);
CHECK_SIZE_AND_OFFSET(tm, tm_yday);
CHECK_SIZE_AND_OFFSET(tm, tm_isdst);
# if !SANITIZER_AIX
CHECK_SIZE_AND_OFFSET(tm, tm_gmtoff);
CHECK_SIZE_AND_OFFSET(tm, tm_zone);
# endif

#if SANITIZER_LINUX
# if SANITIZER_LINUX
CHECK_TYPE_SIZE(mntent);
CHECK_SIZE_AND_OFFSET(mntent, mnt_fsname);
CHECK_SIZE_AND_OFFSET(mntent, mnt_dir);
Expand Down Expand Up @@ -1258,7 +1294,7 @@ CHECK_TYPE_SIZE(clock_t);
CHECK_TYPE_SIZE(clockid_t);
#endif

#if !SANITIZER_ANDROID && !SANITIZER_HAIKU
# if !SANITIZER_ANDROID && !SANITIZER_HAIKU && !SANITIZER_AIX
CHECK_TYPE_SIZE(ifaddrs);
CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_next);
CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_name);
Expand Down
Loading
Loading