diff options
author | Kostya Kortchinsky <kostyak@google.com> | 2016-09-20 22:17:59 +0000 |
---|---|---|
committer | Kostya Kortchinsky <kostyak@google.com> | 2016-09-20 22:17:59 +0000 |
commit | 9a0a02984a9231b7340aaa02fbc46e42c1d31587 (patch) | |
tree | 3c1d379059b78431bc10b86fff242bcedab37f17 /test/scudo | |
parent | c49eacfbb518e8703d51c2230c53cd29f2a15b14 (diff) |
[scudo] Fix a bug in the new Secondary Allocator
Summary:
GetActuallyAllocatedSize() was not accounting for the last page of the mapping
being a guard page, and was returning the wrong number of actually allocated
bytes, which in turn would mess up with the realloc logic. Current tests didn't
find this as the size exercised was only serviced by the Primary.
Correct the issue by subtracting PageSize, and update the realloc test to
exercise paths in both the Primary and the Secondary.
Reviewers: kcc
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D24787
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@282030 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/scudo')
-rw-r--r-- | test/scudo/realloc.cpp | 89 |
1 files changed, 47 insertions, 42 deletions
diff --git a/test/scudo/realloc.cpp b/test/scudo/realloc.cpp index 2a7d5b69f..34734702e 100644 --- a/test/scudo/realloc.cpp +++ b/test/scudo/realloc.cpp @@ -14,54 +14,59 @@ #include <malloc.h> #include <string.h> +#include <vector> + int main(int argc, char **argv) { void *p, *old_p; - size_t size = 32; + // Those sizes will exercise both allocators (Primary & Secondary). + std::vector<size_t> sizes{1 << 5, 1 << 17}; assert(argc == 2); - if (!strcmp(argv[1], "pointers")) { - old_p = p = realloc(nullptr, size); - if (!p) - return 1; - size = malloc_usable_size(p); - // Our realloc implementation will return the same pointer if the size - // requested is lower or equal to the usable size of the associated chunk. - p = realloc(p, size - 1); - if (p != old_p) - return 1; - p = realloc(p, size); - if (p != old_p) - return 1; - // And a new one if the size is greater. - p = realloc(p, size + 1); - if (p == old_p) - return 1; - // A size of 0 will free the chunk and return nullptr. - p = realloc(p, 0); - if (p) - return 1; - old_p = nullptr; - } - if (!strcmp(argv[1], "contents")) { - p = realloc(nullptr, size); - if (!p) - return 1; - for (int i = 0; i < size; i++) - reinterpret_cast<char *>(p)[i] = 'A'; - p = realloc(p, size + 1); - // The contents of the reallocated chunk must match the original one. - for (int i = 0; i < size; i++) - if (reinterpret_cast<char *>(p)[i] != 'A') + for (size_t size : sizes) { + if (!strcmp(argv[1], "pointers")) { + old_p = p = realloc(nullptr, size); + if (!p) return 1; - } - if (!strcmp(argv[1], "memalign")) { - // A chunk coming from memalign cannot be reallocated. - p = memalign(16, size); - if (!p) - return 1; - p = realloc(p, size); - free(p); + size = malloc_usable_size(p); + // Our realloc implementation will return the same pointer if the size + // requested is lower or equal to the usable size of the associated chunk. + p = realloc(p, size - 1); + if (p != old_p) + return 1; + p = realloc(p, size); + if (p != old_p) + return 1; + // And a new one if the size is greater. + p = realloc(p, size + 1); + if (p == old_p) + return 1; + // A size of 0 will free the chunk and return nullptr. + p = realloc(p, 0); + if (p) + return 1; + old_p = nullptr; + } + if (!strcmp(argv[1], "contents")) { + p = realloc(nullptr, size); + if (!p) + return 1; + for (int i = 0; i < size; i++) + reinterpret_cast<char *>(p)[i] = 'A'; + p = realloc(p, size + 1); + // The contents of the reallocated chunk must match the original one. + for (int i = 0; i < size; i++) + if (reinterpret_cast<char *>(p)[i] != 'A') + return 1; + } + if (!strcmp(argv[1], "memalign")) { + // A chunk coming from memalign cannot be reallocated. + p = memalign(16, size); + if (!p) + return 1; + p = realloc(p, size); + free(p); + } } return 0; } |