diff options
Diffstat (limited to 'lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp')
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp index 9e5f844bd13..42a0aa51f4c 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp @@ -15,6 +15,7 @@ #include <string.h> #include <stdint.h> #include <unistd.h> +#include <sys/personality.h> #include <sys/ptrace.h> #include <sys/socket.h> #include <sys/syscall.h> @@ -60,6 +61,7 @@ #define ARCH_GET_GS 0x1004 #endif +#define LLDB_PERSONALITY_GET_CURRENT_SETTINGS 0xffffffff // Support hardware breakpoints in case it has not been defined #ifndef TRAP_HWBKPT @@ -967,7 +969,8 @@ ProcessMonitor::LaunchArgs::LaunchArgs(ProcessMonitor *monitor, const char *stdin_path, const char *stdout_path, const char *stderr_path, - const char *working_dir) + const char *working_dir, + const lldb_private::ProcessLaunchInfo &launch_info) : OperationArgs(monitor), m_module(module), m_argv(argv), @@ -975,7 +978,10 @@ ProcessMonitor::LaunchArgs::LaunchArgs(ProcessMonitor *monitor, m_stdin_path(stdin_path), m_stdout_path(stdout_path), m_stderr_path(stderr_path), - m_working_dir(working_dir) { } + m_working_dir(working_dir), + m_launch_info(launch_info) +{ +} ProcessMonitor::LaunchArgs::~LaunchArgs() { } @@ -1007,6 +1013,7 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process, const char *stdout_path, const char *stderr_path, const char *working_dir, + const lldb_private::ProcessLaunchInfo &launch_info, lldb_private::Error &error) : m_process(static_cast<ProcessLinux *>(process)), m_operation_thread(LLDB_INVALID_HOST_THREAD), @@ -1017,7 +1024,7 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process, { std::unique_ptr<LaunchArgs> args(new LaunchArgs(this, module, argv, envp, stdin_path, stdout_path, stderr_path, - working_dir)); + working_dir, launch_info)); sem_init(&m_operation_pending, 0, 0); sem_init(&m_operation_done, 0, 0); @@ -1145,6 +1152,10 @@ ProcessMonitor::LaunchOpThread(void *arg) bool ProcessMonitor::Launch(LaunchArgs *args) { + assert (args && "null args"); + if (!args) + return false; + ProcessMonitor *monitor = args->m_monitor; ProcessLinux &process = monitor->GetProcess(); const char **argv = args->m_argv; @@ -1219,6 +1230,33 @@ ProcessMonitor::Launch(LaunchArgs *args) if (0 != ::chdir(working_dir)) exit(eChdirFailed); + // Disable ASLR if requested. + if (args->m_launch_info.GetFlags ().Test (lldb::eLaunchFlagDisableASLR)) + { + const int old_personality = personality (LLDB_PERSONALITY_GET_CURRENT_SETTINGS); + if (old_personality == -1) + { + if (log) + log->Printf ("ProcessMonitor::%s retrieval of Linux personality () failed: %s. Cannot disable ASLR.", __FUNCTION__, strerror (errno)); + } + else + { + const int new_personality = personality (ADDR_NO_RANDOMIZE | old_personality); + if (new_personality == -1) + { + if (log) + log->Printf ("ProcessMonitor::%s setting of Linux personality () to disable ASLR failed, ignoring: %s", __FUNCTION__, strerror (errno)); + + } + else + { + if (log) + log->Printf ("ProcessMonitor::%s disbling ASLR: SUCCESS", __FUNCTION__); + + } + } + } + // Execute. We should never return. execve(argv[0], const_cast<char *const *>(argv), |
