OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

More OpenBSD fixes 

Summary:
- Use internal_syscall_ptr in internal_readlink
- use sigcontext on OpenBSD

Patch by David CARLIER

Reviewers: krytarowski, vitalybuka

Reviewed By: vitalybuka

Subscribers: kubamracek, llvm-commits, #sanitizers

Differential Revision: https://reviews.llvm.org/D44713

llvm-svn: 328239
This commit is contained in:
Vitaly Buka 2018-03-22 20:42:28 +00:00
parent e006b8f486
commit 022a82cb15
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
View File

@ -68,6 +68,7 @@
#include <ucontext.h> #include <ucontext.h>
#endif #endif
#if SANITIZER_OPENBSD #if SANITIZER_OPENBSD
#include <signal.h>
#include <sys/futex.h> #include <sys/futex.h>
#endif #endif
#include <unistd.h> #include <unistd.h>
@ -391,9 +392,12 @@ uptr internal_dup2(int oldfd, int newfd) {
} }
uptr internal_readlink(const char *path, char *buf, uptr bufsize) { uptr internal_readlink(const char *path, char *buf, uptr bufsize) {
#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS || SANITIZER_OPENBSD #if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf, return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,
bufsize); bufsize);
#elif SANITIZER_OPENBSD
return internal_syscall_ptr(SYSCALL(readlinkat), AT_FDCWD, (uptr)path,
(uptr)buf, bufsize);
#else #else
return internal_syscall_ptr(SYSCALL(readlink), path, buf, bufsize); return internal_syscall_ptr(SYSCALL(readlink), path, buf, bufsize);
#endif #endif
@ -1702,8 +1706,13 @@ static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) {
} }
#endif #endif
#if SANITIZER_OPENBSD
using Context = sigcontext;
#else
using Context = ucontext;
#endif // !SANITIZER_OPENBSD
SignalContext::WriteFlag SignalContext::GetWriteFlag() const { SignalContext::WriteFlag SignalContext::GetWriteFlag() const {
#if !SANITIZER_OPENBSD
ucontext_t *ucontext = (ucontext_t *)context; ucontext_t *ucontext = (ucontext_t *)context;
#if defined(__x86_64__) || defined(__i386__) #if defined(__x86_64__) || defined(__i386__)
static const uptr PF_WRITE = 1U << 1; static const uptr PF_WRITE = 1U << 1;
@ -1711,12 +1720,14 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag() const {
uptr err = ucontext->uc_mcontext.mc_err; uptr err = ucontext->uc_mcontext.mc_err;
#elif SANITIZER_NETBSD #elif SANITIZER_NETBSD
uptr err = ucontext->uc_mcontext.__gregs[_REG_ERR]; uptr err = ucontext->uc_mcontext.__gregs[_REG_ERR];
#elif SANITIZER_OPENBSD
uptr err = ucontext->sc_err;
#elif SANITIZER_SOLARIS && defined(__i386__) #elif SANITIZER_SOLARIS && defined(__i386__)
# define ERR 13 const int Err = 13;
uptr err = ucontext->uc_mcontext.gregs[ERR]; uptr err = ucontext->uc_mcontext.gregs[Err];
#else #else
uptr err = ucontext->uc_mcontext.gregs[REG_ERR]; uptr err = ucontext->uc_mcontext.gregs[REG_ERR];
#endif #endif // SANITIZER_FREEBSD
return err & PF_WRITE ? WRITE : READ; return err & PF_WRITE ? WRITE : READ;
#elif defined(__arm__) #elif defined(__arm__)
static const uptr FSR_WRITE = 1U << 11; static const uptr FSR_WRITE = 1U << 11;
@ -1737,9 +1748,6 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag() const {
(void)ucontext; (void)ucontext;
return UNKNOWN; // FIXME: Implement. return UNKNOWN; // FIXME: Implement.
#endif #endif
#else // !SANITIZER_OPENBSD
return UNKNOWN;
#endif // !SANITIZER_OPENBSD
} }
void SignalContext::DumpAllRegisters(void *context) { void SignalContext::DumpAllRegisters(void *context) {
@ -1775,6 +1783,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
*pc = ucontext->uc_mcontext.mc_rip; *pc = ucontext->uc_mcontext.mc_rip;
*bp = ucontext->uc_mcontext.mc_rbp; *bp = ucontext->uc_mcontext.mc_rbp;
*sp = ucontext->uc_mcontext.mc_rsp; *sp = ucontext->uc_mcontext.mc_rsp;
#elif SANITIZER_OPENBSD
sigcontext *ucontext = (sigcontext *)context;
*pc = ucontext->sc_rip;
*bp = ucontext->sc_rbp;
*sp = ucontext->sc_rsp;
# else # else
ucontext_t *ucontext = (ucontext_t*)context; ucontext_t *ucontext = (ucontext_t*)context;
*pc = ucontext->uc_mcontext.gregs[REG_RIP]; *pc = ucontext->uc_mcontext.gregs[REG_RIP];
@ -1787,6 +1800,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
*pc = ucontext->uc_mcontext.mc_eip; *pc = ucontext->uc_mcontext.mc_eip;
*bp = ucontext->uc_mcontext.mc_ebp; *bp = ucontext->uc_mcontext.mc_ebp;
*sp = ucontext->uc_mcontext.mc_esp; *sp = ucontext->uc_mcontext.mc_esp;
#elif SANITIZER_OPENBSD
sigcontext *ucontext = (sigcontext *)context;
*pc = ucontext->sc_eip;
*bp = ucontext->sc_ebp;
*sp = ucontext->sc_esp;
# else # else
ucontext_t *ucontext = (ucontext_t*)context; ucontext_t *ucontext = (ucontext_t*)context;
# if SANITIZER_SOLARIS # if SANITIZER_SOLARIS