This is an archive of the discontinued LLVM Phabricator instance.

Differential D52646

Switch sanitizer_procmaps_bsd to internal_sysctl
ClosedPublic

Authored by krytarowski on Sep 28 2018, 4:52 AM.

Details

Reviewers
joerg
vitalybuka
Commits
rGa14b90838135: Switch sanitizer_procmaps_bsd to internal_sysctl
rL343370: Switch sanitizer_procmaps_bsd to internal_sysctl
rCRT343370: Switch sanitizer_procmaps_bsd to internal_sysctl
Summary

Stop using directly sysctl(3) routines in sanitizer_procmaps_bsd
and replace it with internal_sysctl().

This will allow to install interceptors for sysctl(3).

Diff Detail

Event Timeline

krytarowski created this revision.Sep 28 2018, 4:52 AM
Herald added a subscriber: kubamracek. · View Herald TranscriptSep 28 2018, 4:53 AM
vitalybuka accepted this revision.Sep 28 2018, 12:51 PM
This revision is now accepted and ready to land.Sep 28 2018, 12:51 PM
Closed by commit rCRT343370: Switch sanitizer_procmaps_bsd to internal_sysctl (authored by kamil). · Explain WhySep 29 2018, 12:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
sanitizer_common/
8 lines

Diff 167582

lib/sanitizer_common/sanitizer_procmaps_bsd.cc

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines#elif SANITIZER_NETBSD
VM_PROC_MAP, VM_PROC_MAP,
getpid(), getpid(),
sizeof(struct kinfo_vmentry) sizeof(struct kinfo_vmentry)
#else #else
#error "not supported" #error "not supported"
#endif #endif
}; };
size_t Size = 0; uptr Size = 0;
int Err = sysctl(Mib, ARRAY_SIZE(Mib), NULL, &Size, NULL, 0); int Err = internal_sysctl(Mib, ARRAY_SIZE(Mib), NULL, &Size, NULL, 0);
CHECK_EQ(Err, 0); CHECK_EQ(Err, 0);
CHECK_GT(Size, 0); CHECK_GT(Size, 0);
#if !SANITIZER_OPENBSD #if !SANITIZER_OPENBSD
size_t MmapedSize = Size * 4 / 3; size_t MmapedSize = Size * 4 / 3;
void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()"); void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()");
Size = MmapedSize; Size = MmapedSize;
Err = sysctl(Mib, ARRAY_SIZE(Mib), VmMap, &Size, NULL, 0); Err = internal_sysctl(Mib, ARRAY_SIZE(Mib), VmMap, &Size, NULL, 0);
CHECK_EQ(Err, 0); CHECK_EQ(Err, 0);
proc_maps->data = (char *)VmMap; proc_maps->data = (char *)VmMap;
#else #else
size_t PageSize = GetPageSize(); size_t PageSize = GetPageSize();
size_t MmapedSize = Size; size_t MmapedSize = Size;
MmapedSize = ((MmapedSize - 1) / PageSize + 1) * PageSize; MmapedSize = ((MmapedSize - 1) / PageSize + 1) * PageSize;
char *Mem = (char *)MmapOrDie(MmapedSize, "ReadProcMaps()"); char *Mem = (char *)MmapOrDie(MmapedSize, "ReadProcMaps()");
Size = 2 * Size + 10 * sizeof(struct kinfo_vmentry); Size = 2 * Size + 10 * sizeof(struct kinfo_vmentry);
if (Size > 0x10000) if (Size > 0x10000)
Size = 0x10000; Size = 0x10000;
Size = (Size / sizeof(struct kinfo_vmentry)) * sizeof(struct kinfo_vmentry); Size = (Size / sizeof(struct kinfo_vmentry)) * sizeof(struct kinfo_vmentry);
Err = sysctl(Mib, ARRAY_SIZE(Mib), Mem, &Size, NULL, 0); Err = internal_sysctl(Mib, ARRAY_SIZE(Mib), Mem, &Size, NULL, 0);
CHECK_EQ(Err, 0); CHECK_EQ(Err, 0);
MmapedSize = Size; MmapedSize = Size;
proc_maps->data = Mem; proc_maps->data = Mem;
#endif #endif
proc_maps->mmaped_size = MmapedSize; proc_maps->mmaped_size = MmapedSize;
proc_maps->len = Size; proc_maps->len = Size;
} }
Show All 40 Lines