diff options
author | Kostya Kortchinsky <kostyak@google.com> | 2017-07-31 22:46:01 +0000 |
---|---|---|
committer | Kostya Kortchinsky <kostyak@google.com> | 2017-07-31 22:46:01 +0000 |
commit | 42a455c34ed860066b92b8957fa9dd786026939d (patch) | |
tree | dba7fc08a5845aa386d148ba870fe5103d37efbc | |
parent | 0be3d11da345e02fcb1fe9dd5832377d68d46253 (diff) |
[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
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@309637 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/msan/msan_allocator.cc | 4 | ||||
-rw-r--r-- | lib/msan/tests/msan_test.cc | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc index 1b134e15a..8e9d4d397 100644 --- a/lib/msan/msan_allocator.cc +++ b/lib/msan/msan_allocator.cc @@ -255,10 +255,6 @@ void *msan_valloc(uptr size, StackTrace *stack) { void *msan_pvalloc(uptr size, StackTrace *stack) { uptr PageSize = GetPageSizeCached(); - if (UNLIKELY(CheckForPvallocOverflow(size, PageSize))) { - errno = errno_ENOMEM; - return Allocator::FailureHandler::OnBadRequest(); - } // pvalloc(0) should allocate one page. size = size ? RoundUpTo(size, PageSize) : PageSize; return SetErrnoOnNull(MsanAllocate(stack, size, PageSize, false)); diff --git a/lib/msan/tests/msan_test.cc b/lib/msan/tests/msan_test.cc index b4cc8493a..b2d5f7c60 100644 --- a/lib/msan/tests/msan_test.cc +++ b/lib/msan/tests/msan_test.cc @@ -3449,17 +3449,6 @@ TEST(MemorySanitizer, pvalloc) { EXPECT_EQ(0U, (uintptr_t)p % PageSize); EXPECT_EQ(PageSize, __sanitizer_get_allocated_size(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 |