replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[msan] Reverting D36093 

Summary:
Reverting D36093 until I can figure out how to launch the correct tests :/
My apologies.

Reviewers: alekseyshl

Reviewed By: alekseyshl

Subscribers: llvm-commits

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

llvm-svn: 309637
This commit is contained in:
Kostya Kortchinsky 2017-07-31 22:46:01 +00:00
parent 086597aee3
commit 9d52cedb24
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/msan/msan_allocator.cc
View File

@ -255,10 +255,6 @@ void *msan_valloc(uptr size, StackTrace *stack) {
void *msan_pvalloc(uptr size, StackTrace *stack) { void *msan_pvalloc(uptr size, StackTrace *stack) {
uptr PageSize = GetPageSizeCached(); uptr PageSize = GetPageSizeCached();
if (UNLIKELY(CheckForPvallocOverflow(size, PageSize))) {
errno = errno_ENOMEM;
return Allocator::FailureHandler::OnBadRequest();
}
// pvalloc(0) should allocate one page. // pvalloc(0) should allocate one page.
size = size ? RoundUpTo(size, PageSize) : PageSize; size = size ? RoundUpTo(size, PageSize) : PageSize;
return SetErrnoOnNull(MsanAllocate(stack, size, PageSize, false)); return SetErrnoOnNull(MsanAllocate(stack, size, PageSize, false));

11
compiler-rt/lib/msan/tests/msan_test.cc
View File

@ -3449,17 +3449,6 @@ TEST(MemorySanitizer, pvalloc) {
EXPECT_EQ(0U, (uintptr_t)p % PageSize); EXPECT_EQ(0U, (uintptr_t)p % PageSize);
EXPECT_EQ(PageSize, __sanitizer_get_allocated_size(p)); EXPECT_EQ(PageSize, __sanitizer_get_allocated_size(p));
free(p); free(p);
// Overflows in pvalloc should be caught.
errno = 0;
p = pvalloc((uintptr_t)-PageSize);
EXPECT_EQ(p, nullptr);
EXPECT_EQ(errno, ENOMEM);
errno = 0;
p = pvalloc((uintptr_t)-1);
EXPECT_EQ(p, nullptr);
EXPECT_EQ(errno, ENOMEM);
} }
#endif #endif