diff options
| author | Kostya Serebryany <kcc@google.com> | 2017-03-29 22:59:28 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2017-03-29 22:59:28 +0000 |
| commit | 2203ee08ddb7cde08cad4c6a742bc37ec8e195b5 (patch) | |
| tree | e6a1ee67b0526b3c5a736776f00e06127ff8e83c | |
| parent | acd9a6f09d391bb14155d95791cafa78dec279df (diff) | |
| download | bcm5719-llvm-2203ee08ddb7cde08cad4c6a742bc37ec8e195b5.tar.gz bcm5719-llvm-2203ee08ddb7cde08cad4c6a742bc37ec8e195b5.zip | |
[sanitizers] Fix get_groups interceptor in sanitizer (https://reviews.llvm.org/D31332, patch by Martin Liška)
llvm-svn: 299036
| -rw-r--r-- | compiler-rt/lib/msan/tests/msan_test.cc | 15 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/compiler-rt/lib/msan/tests/msan_test.cc b/compiler-rt/lib/msan/tests/msan_test.cc index 6f4dd99b339..59c40d38477 100644 --- a/compiler-rt/lib/msan/tests/msan_test.cc +++ b/compiler-rt/lib/msan/tests/msan_test.cc @@ -3502,6 +3502,21 @@ TEST(MemorySanitizer, getgroups) { EXPECT_NOT_POISONED(gids[i]); } +TEST(MemorySanitizer, getgroups_zero) { + gid_t group; + int n = getgroups(0, &group); + ASSERT_GE(n, 0); +} + +TEST(MemorySanitizer, getgroups_negative) { + gid_t group; + int n = getgroups(-1, 0); + ASSERT_EQ(-1, n); + + n = getgroups(-1, 0); + ASSERT_EQ(-1, n); +} + TEST(MemorySanitizer, wordexp) { wordexp_t w; int res = wordexp("a b c", &w, 0); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 4f4cd43aba3..b4148621d84 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -3471,7 +3471,8 @@ INTERCEPTOR(int, getgroups, int size, u32 *lst) { // its metadata. See // https://github.com/google/sanitizers/issues/321. int res = REAL(getgroups)(size, lst); - if (res && lst) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, lst, res * sizeof(*lst)); + if (res >= 0 && lst && size > 0) + COMMON_INTERCEPTOR_WRITE_RANGE(ctx, lst, res * sizeof(*lst)); return res; } #define INIT_GETGROUPS COMMON_INTERCEPT_FUNCTION(getgroups); |
