forked from OSchip/llvm-project
OpenBSD UBsan support procmaps
Summary: procmaps OpenBSD specifics Patch by David CARLIER Reviewers: krytarowski, vitalybuka Reviewed By: vitalybuka Subscribers: mgorny, emaste, kubamracek, fedor.sergeev, llvm-commits, #sanitizers Differential Revision: https://reviews.llvm.org/D44050 llvm-svn: 327677
This commit is contained in:
parent
49a56faee2
commit
fc8bb95724
|
|
@ -26,7 +26,7 @@ set(SANITIZER_SOURCES_NOTERMINATION
|
|||
sanitizer_posix.cc
|
||||
sanitizer_printf.cc
|
||||
sanitizer_procmaps_common.cc
|
||||
sanitizer_procmaps_freebsd.cc
|
||||
sanitizer_procmaps_bsd.cc
|
||||
sanitizer_procmaps_linux.cc
|
||||
sanitizer_procmaps_mac.cc
|
||||
sanitizer_procmaps_solaris.cc
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
|
||||
#include "sanitizer_platform.h"
|
||||
|
||||
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \
|
||||
SANITIZER_MAC || SANITIZER_SOLARIS
|
||||
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \
|
||||
SANITIZER_OPENBSD || SANITIZER_MAC || SANITIZER_SOLARIS
|
||||
|
||||
#include "sanitizer_common.h"
|
||||
#include "sanitizer_internal_defs.h"
|
||||
|
|
@ -95,6 +95,5 @@ uptr ParseHex(const char **p);
|
|||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD ||
|
||||
// SANITIZER_MAC || SANITIZER_SOLARIS
|
||||
#endif
|
||||
#endif // SANITIZER_PROCMAPS_H
|
||||
|
|
|
|||
|
|
@ -0,0 +1,137 @@
|
|||
//===-- sanitizer_procmaps_bsd.cc -----------------------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// Information about the process mappings
|
||||
// (FreeBSD, OpenBSD and NetBSD-specific parts).
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "sanitizer_platform.h"
|
||||
#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD
|
||||
#include "sanitizer_common.h"
|
||||
#if SANITIZER_FREEBSD
|
||||
#include "sanitizer_freebsd.h"
|
||||
#endif
|
||||
#include "sanitizer_procmaps.h"
|
||||
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#if SANITIZER_FREEBSD
|
||||
#include <sys/user.h>
|
||||
#endif
|
||||
|
||||
#include <limits.h>
|
||||
#if SANITIZER_OPENBSD
|
||||
#define KVME_PROT_READ KVE_PROT_READ
|
||||
#define KVME_PROT_WRITE KVE_PROT_WRITE
|
||||
#define KVME_PROT_EXEC KVE_PROT_EXEC
|
||||
#endif
|
||||
|
||||
// Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
|
||||
#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
|
||||
#include <osreldate.h>
|
||||
#if __FreeBSD_version <= 902001 // v9.2
|
||||
#define kinfo_vmentry xkinfo_vmentry
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace __sanitizer {
|
||||
|
||||
void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
|
||||
const int Mib[] = {
|
||||
#if SANITIZER_FREEBSD
|
||||
CTL_KERN,
|
||||
KERN_PROC,
|
||||
KERN_PROC_VMMAP,
|
||||
getpid()
|
||||
#elif SANITIZER_OPENBSD
|
||||
CTL_KERN,
|
||||
KERN_PROC_VMMAP,
|
||||
getpid()
|
||||
#elif SANITIZER_NETBSD
|
||||
CTL_VM,
|
||||
VM_PROC,
|
||||
VM_PROC_MAP,
|
||||
getpid(),
|
||||
sizeof(struct kinfo_vmentry)
|
||||
#else
|
||||
#error "not supported"
|
||||
#endif
|
||||
};
|
||||
|
||||
size_t Size = 0;
|
||||
int Err = sysctl(Mib, ARRAY_SIZE(Mib), NULL, &Size, NULL, 0);
|
||||
CHECK_EQ(Err, 0);
|
||||
CHECK_GT(Size, 0);
|
||||
|
||||
#if !SANITIZER_OPENBSD
|
||||
size_t MmapedSize = Size * 4 / 3;
|
||||
void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()");
|
||||
Size = MmapedSize;
|
||||
Err = sysctl(Mib, ARRAY_SIZE(Mib), VmMap, &Size, NULL, 0);
|
||||
CHECK_EQ(Err, 0);
|
||||
proc_maps->data = (char *)VmMap;
|
||||
#else
|
||||
size_t PageSize = GetPageSize();
|
||||
size_t MmapedSize = Size;
|
||||
MmapedSize = ((MmapedSize - 1) / PageSize + 1) * PageSize;
|
||||
char *Mem = (char *)MmapOrDie(MmapedSize, "ReadProcMaps()");
|
||||
Size = 2 * Size + 10 * sizeof(struct kinfo_vmentry);
|
||||
if (Size > 0x10000)
|
||||
Size = 0x10000;
|
||||
Size = (Size / sizeof(struct kinfo_vmentry)) * sizeof(struct kinfo_vmentry);
|
||||
Err = sysctl(Mib, ARRAY_SIZE(Mib), Mem, &Size, NULL, 0);
|
||||
CHECK_EQ(Err, 0);
|
||||
MmapedSize = Size;
|
||||
proc_maps->data = Mem;
|
||||
#endif
|
||||
|
||||
proc_maps->mmaped_size = MmapedSize;
|
||||
proc_maps->len = Size;
|
||||
}
|
||||
|
||||
bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
|
||||
char *last = data_.proc_self_maps.data + data_.proc_self_maps.len;
|
||||
if (data_.current >= last)
|
||||
return false;
|
||||
const struct kinfo_vmentry *VmEntry =
|
||||
(const struct kinfo_vmentry *)data_.current;
|
||||
|
||||
segment->start = (uptr)VmEntry->kve_start;
|
||||
segment->end = (uptr)VmEntry->kve_end;
|
||||
segment->offset = (uptr)VmEntry->kve_offset;
|
||||
|
||||
segment->protection = 0;
|
||||
if ((VmEntry->kve_protection & KVME_PROT_READ) != 0)
|
||||
segment->protection |= kProtectionRead;
|
||||
if ((VmEntry->kve_protection & KVME_PROT_WRITE) != 0)
|
||||
segment->protection |= kProtectionWrite;
|
||||
if ((VmEntry->kve_protection & KVME_PROT_EXEC) != 0)
|
||||
segment->protection |= kProtectionExecute;
|
||||
|
||||
#if !SANITIZER_OPENBSD
|
||||
if (segment->filename != NULL && segment->filename_size > 0) {
|
||||
internal_snprintf(segment->filename,
|
||||
Min(segment->filename_size, (uptr)PATH_MAX), "%s",
|
||||
VmEntry->kve_path);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if SANITIZER_FREEBSD
|
||||
data_.current += VmEntry->kve_structsize;
|
||||
#else
|
||||
data_.current += sizeof(*VmEntry);
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
#include "sanitizer_platform.h"
|
||||
|
||||
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \
|
||||
SANITIZER_SOLARIS
|
||||
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \
|
||||
SANITIZER_OPENBSD || SANITIZER_SOLARIS
|
||||
|
||||
#include "sanitizer_common.h"
|
||||
#include "sanitizer_placement_new.h"
|
||||
|
|
@ -170,5 +170,4 @@ void GetMemoryProfile(fill_profile_f cb, uptr *stats, uptr stats_size) {
|
|||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ||
|
||||
// SANITIZER_SOLARIS
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue