diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2023-11-02 15:17:53 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2024-01-14 12:45:15 -0800 |
| commit | 7c4e271fe73f4775d308d5851c07bc21cdd08570 (patch) | |
| tree | 5147cc2233cfd58a8ec1ab01bf3ce0a48c7071d8 /src/corelib/io/qprocess_unix.cpp | |
| parent | 3d3eb7e402285b85b9f1296613a597453bcd18c9 (diff) | |
QProcess/Unix: detect ASan and TSan dynamically
Fixes: QTBUG-117533
Fixes: QTBUG-117954
Task-number: QTBUG-104493
Pick-to: 6.7 6.6
Change-Id: I09c3950e719e4b259bc7fffd1793ee472c5d5a9a
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src/corelib/io/qprocess_unix.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 6b291c5a2c..0f6ac95a89 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -245,6 +245,7 @@ struct QChildProcess CharPointerList envp; sigset_t oldsigset; int workingDirectory = -2; + bool isUsingVfork = usingVfork(); bool ok() const { @@ -290,7 +291,7 @@ struct QChildProcess // We only block Unix signals if we're using vfork(), to avoid a // changing behavior to the user's modifier and because in some OSes // this action would block crashing signals too. - if (usingVfork()) { + if (isUsingVfork) { sigset_t emptyset; sigfillset(&emptyset); pthread_sigmask(SIG_SETMASK, &emptyset, &oldsigset); @@ -299,7 +300,7 @@ struct QChildProcess void restoreSignalMask() const noexcept { - if (usingVfork()) + if (isUsingVfork) pthread_sigmask(SIG_SETMASK, &oldsigset, nullptr); } @@ -308,7 +309,7 @@ struct QChildProcess template <typename Lambda> int doFork(Lambda &&childLambda) { pid_t pid; - if (usingVfork()) { + if (isUsingVfork) { QT_IGNORE_DEPRECATIONS(pid = vfork();) } else { pid = fork(); @@ -320,7 +321,7 @@ struct QChildProcess int startChild(pid_t *pid) { - int ffdflags = FFD_CLOEXEC | (usingVfork() ? 0 : FFD_USE_FORK); + int ffdflags = FFD_CLOEXEC | (isUsingVfork ? 0 : FFD_USE_FORK); return ::vforkfd(ffdflags, pid, &QChildProcess::startProcess, this); } @@ -616,6 +617,10 @@ inline QString QChildProcess::resolveExecutable(const QString &program) return program; } +extern "C" { +__attribute__((weak)) pid_t __interceptor_vfork(); +} + inline bool globalUsingVfork() noexcept { #if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) @@ -638,7 +643,10 @@ inline bool globalUsingVfork() noexcept return false; #endif - return true; + // Dynamically detect whether libasan or libtsan are loaded into the + // process' memory. We need this because the user's code may be compiled + // with ASan or TSan, but not Qt. + return __interceptor_vfork == nullptr; } inline bool QChildProcess::usingVfork() const noexcept |