-
Notifications
You must be signed in to change notification settings - Fork 10.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[scudo] Change tests that use setrlimit to cause mmap to fail. #87004
Conversation
It appears that qemu does not actually cause mmap to fail when calling setrlimit to limit the address space size. In the two tests that use setrlimit, detect if mmap still works and skip the tests in that case. Since all Android targets should support setrlimit, compile out the mmap check code for them.
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Christopher Ferris (cferris1000) ChangesIt appears that qemu does not actually cause mmap to fail when calling setrlimit to limit the address space size. In the two tests that use setrlimit, detect if mmap still works and skip the tests in that case. Since all Android targets should support setrlimit, compile out the mmap check code for them. Full diff: https://github.com/llvm/llvm-project/pull/87004.diff 2 Files Affected:
diff --git a/compiler-rt/lib/scudo/standalone/tests/strings_test.cpp b/compiler-rt/lib/scudo/standalone/tests/strings_test.cpp
index 17a596d712d0ca..c28ee7287aba14 100644
--- a/compiler-rt/lib/scudo/standalone/tests/strings_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/strings_test.cpp
@@ -129,6 +129,8 @@ TEST(ScudoStringsTest, Padding) {
}
#if defined(__linux__)
+
+#include <sys/mman.h>
#include <sys/resource.h>
TEST(ScudoStringsTest, CapacityIncreaseFails) {
@@ -136,9 +138,20 @@ TEST(ScudoStringsTest, CapacityIncreaseFails) {
rlimit Limit = {};
EXPECT_EQ(0, getrlimit(RLIMIT_AS, &Limit));
+
rlimit EmptyLimit = {.rlim_cur = 0, .rlim_max = Limit.rlim_max};
EXPECT_EQ(0, setrlimit(RLIMIT_AS, &EmptyLimit));
+#if !SCUDO_ANDROID
+ // qemu does not honor the setrlimit, so verify before proceeding.
+ void *ptr = mmap(nullptr, 100, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+ if (ptr != MAP_FAILED) {
+ munmap(ptr, 100);
+ setrlimit(RLIMIT_AS, &Limit);
+ GTEST_SKIP() << "Limiting address space does not prevent mmap.";
+ }
+#endif
+
// Test requires that the default length is at least 6 characters.
scudo::uptr MaxSize = Str.capacity();
EXPECT_LE(6u, MaxSize);
diff --git a/compiler-rt/lib/scudo/standalone/tests/vector_test.cpp b/compiler-rt/lib/scudo/standalone/tests/vector_test.cpp
index add62c5a42a3e4..e65c5d6cc2759e 100644
--- a/compiler-rt/lib/scudo/standalone/tests/vector_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/vector_test.cpp
@@ -44,6 +44,7 @@ TEST(ScudoVectorTest, ResizeReduction) {
#if defined(__linux__)
+#include <sys/mman.h>
#include <sys/resource.h>
// Verify that if the reallocate fails, nothing new is added.
@@ -58,6 +59,16 @@ TEST(ScudoVectorTest, ReallocateFails) {
rlimit EmptyLimit = {.rlim_cur = 0, .rlim_max = Limit.rlim_max};
EXPECT_EQ(0, setrlimit(RLIMIT_AS, &EmptyLimit));
+#if !SCUDO_ANDROID
+ // qemu does not honor the setrlimit, so verify before proceeding.
+ void *ptr = mmap(nullptr, 100, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+ if (ptr != MAP_FAILED) {
+ munmap(ptr, 100);
+ setrlimit(RLIMIT_AS, &Limit);
+ GTEST_SKIP() << "Limiting address space does not prevent mmap.";
+ }
+#endif
+
V.resize(capacity);
// Set the last element so we can check it later.
V.back() = '\0';
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
I think, conceivably, someone could run SCUDO_ANDROID tests under usermode qemu. I would remove that check. |
Done. |
LGTM. |
It appears that qemu does not actually cause mmap to fail when calling setrlimit to limit the address space size. In the two tests that use setrlimit, detect if mmap still works and skip the tests in that case.
Since all Android targets should support setrlimit, compile out the mmap check code for them.