diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-07-29 18:44:51 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-08-06 16:40:58 +0200 |
| commit | cc94387e674c7db7b15efe56763fe6c87363f73d (patch) | |
| tree | d91dcaaf32305ac0bf52a49004ee908bc1d935f9 | |
| parent | f8e994d928fc1636f7aefc6dd9ee8374c7cc63f3 (diff) | |
| download | systemd-cc94387e674c7db7b15efe56763fe6c87363f73d.tar.gz | |
test: correctly detect ASan on s390x
s390x uses BRAS(L) instead of CALL(Q), e.g.:
```
1009528: c0 e5 ff ff f8 a0 brasl %r14,1008668 <__asan_report_load1@plt>
10095f0: c0 e5 ff ff ea ec brasl %r14,1006bc8 <__asan_stack_malloc_4@plt>
10097f8: c0 e5 ff ff f8 f8 brasl %r14,10089e8 <__asan_report_load8@plt>
```
x86_64 for reference:
```
4011f3: e8 48 fe ff ff callq 401040 <__asan_report_load1@plt>
401227: e8 24 fe ff ff callq 401050 <__asan_report_load8@plt>
401251: e8 da fd ff ff callq 401030 <__asan_init@plt>
```
(cherry picked from commit 8bf79f05532162d19fe6ee211297cff81b4f9874)
| -rw-r--r-- | test/test-functions | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index c6b8d4cd59..11075c9b96 100644 --- a/test/test-functions +++ b/test/test-functions @@ -229,7 +229,7 @@ is_built_with_asan() { # Borrowed from https://github.com/google/oss-fuzz/blob/cd9acd02f9d3f6e80011cc1e9549be526ce5f270/infra/base-images/base-runner/bad_build_check#L182 local _asan_calls - _asan_calls="$(objdump -dC "$SYSTEMD_JOURNALD" | grep -E "callq?\s+[0-9a-f]+\s+<__asan" -c)" + _asan_calls="$(objdump -dC "$SYSTEMD_JOURNALD" | grep -E "(callq?|brasl?)\s+[^ <]+\s+<__asan" -c)" if ((_asan_calls < 1000)); then return 1 else |