Skip to content

Commit

Permalink
[hwasan] Fix TestCases/thread-uaf.c.
Browse files Browse the repository at this point in the history
On newer glibc, this test detects an extra match somewhere under
pthread_getattr_np. This results in Thread: lines getting spread out in
the report and failing to match the CHECKs.

Fix the CHECKs to allow this possibility.

Reviewed By: fmayer

Differential Revision: https://reviews.llvm.org/D111841
  • Loading branch information
eugenis committed Oct 14, 2021
1 parent 039096e commit 7a3fb71
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions compiler-rt/test/hwasan/TestCases/thread-uaf.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Tests UAF detection where Allocate/Deallocate/Use
// happen in separate threads.
// RUN: %clang_hwasan %s -o %t && not %run %t 2>&1 | FileCheck %s
// RUN: %clang_hwasan %s -o %t && not %run %t > %t.out 2>&1
// RUN: cat %t.out | FileCheck %s
// RUN: cat %t.out | FileCheck --check-prefix=CHECK-THREAD %s
// REQUIRES: stable-runtime

#include <pthread.h>
Expand Down Expand Up @@ -35,10 +37,10 @@ void *Use(void *arg) {
// CHECK: in Deallocate
// CHECK: previously allocated here:
// CHECK: in Allocate
// CHECK-DAG: Thread: T2 0x
// CHECK-DAG: Thread: T3 0x
// CHECK-DAG: Thread: T0 0x
// CHECK-DAG: Thread: T1 0x
// CHECK-THREAD-DAG: Thread: T2 0x
// CHECK-THREAD-DAG: Thread: T3 0x
// CHECK-THREAD-DAG: Thread: T0 0x
// CHECK-THREAD-DAG: Thread: T1 0x
__sync_fetch_and_add(&state, 1);
return NULL;
}
Expand Down

0 comments on commit 7a3fb71

Please sign in to comment.