This is an archive of the discontinued LLVM Phabricator instance.

Differential D45281

[asan] Fix aligned_alloc test case
ClosedPublic

Authored by cryptoad on Apr 4 2018, 12:58 PM.

Details

Reviewers
alekseyshl
Commits
rG0716fb9376c8: [asan] Fix aligned_alloc test case
rCRT329226: [asan] Fix aligned_alloc test case
rL329226: [asan] Fix aligned_alloc test case
Summary

Under some circumstances (that I haven't dug further into), the first stack
frame for the test looks like:
#0 0x4e6038 in __interceptor_memalign.localalias.1 ...compiler-rt/lib/asan/asan_malloc_linux.cc:113
which isn't matched by the current CHECK.

Expand the CHECK to match aligned_alloc or memalign. Hopefully this should fix
the PowerPC issue as well, otherwise we'll bring back the FIXME.

Diff Detail

Repository
rL LLVM

Event Timeline

cryptoad created this revision.Apr 4 2018, 12:58 PM
Harbormaster completed remote builds in B16729: Diff 141029.Apr 4 2018, 12:58 PM
Herald added subscribers: Restricted Project, delcypher, kubamracek, srhines. · View Herald TranscriptApr 4 2018, 12:58 PM
alekseyshl accepted this revision.Apr 4 2018, 12:59 PM
This revision is now accepted and ready to land.Apr 4 2018, 12:59 PM
Closed by commit rL329226: [asan] Fix aligned_alloc test case (authored by cryptoad). · Explain WhyApr 4 2018, 1:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
trunk/
test/
asan/
TestCases/
Linux/
5 lines

Diff 141030

compiler-rt/trunk/test/asan/TestCases/Linux/aligned_alloc-alignment.cc

// RUN: %clangxx_asan -O0 %s -o %t // RUN: %clangxx_asan -O0 %s -o %t
// RUN: %env_asan_opts=allocator_may_return_null=0 not %run %t 2>&1 | FileCheck %s // RUN: %env_asan_opts=allocator_may_return_null=0 not %run %t 2>&1 | FileCheck %s
// RUN: %env_asan_opts=allocator_may_return_null=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-NULL // RUN: %env_asan_opts=allocator_may_return_null=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-NULL
// FIXME(alekseyshl): #0 frame does not look as expected on ppc64be, fix it. // UNSUPPORTED: android
// UNSUPPORTED: android,powerpc64
// REQUIRES: stable-runtime // REQUIRES: stable-runtime
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
extern void *aligned_alloc(size_t alignment, size_t size); extern void *aligned_alloc(size_t alignment, size_t size);
int main() { int main() {
void *p = aligned_alloc(17, 100); void *p = aligned_alloc(17, 100);
// CHECK: ERROR: AddressSanitizer: invalid allocation alignment: 17 // CHECK: ERROR: AddressSanitizer: invalid allocation alignment: 17
// CHECK: {{#0 0x.* in .*aligned_alloc}} // CHECK: {{#0 0x.* in .*}}{{aligned_alloc|memalign}}
// CHECK: {{#1 0x.* in main .*aligned_alloc-alignment.cc:}}[[@LINE-3]] // CHECK: {{#1 0x.* in main .*aligned_alloc-alignment.cc:}}[[@LINE-3]]
// CHECK: SUMMARY: AddressSanitizer: invalid-allocation-alignment // CHECK: SUMMARY: AddressSanitizer: invalid-allocation-alignment
printf("pointer after failed aligned_alloc: %zd\n", (size_t)p); printf("pointer after failed aligned_alloc: %zd\n", (size_t)p);
// CHECK-NULL: pointer after failed aligned_alloc: 0 // CHECK-NULL: pointer after failed aligned_alloc: 0
return 0; return 0;
} }