diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2021-08-03 18:03:25 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2021-08-13 20:00:57 +0200 |
| commit | 2489ab887a86e8b1b253aef742e365a606db3a4f (patch) | |
| tree | 68d9bc86958b784f14435636d0e6c1e82ec4afd6 /pkg/report/testdata/darwin | |
| parent | 3fd2ea69e05557e7e0fef9b68263b4150670671c (diff) | |
pkg/report: do more agressive NUM-replacement
Replace not just long sequences of digits in report titles, but every
sequence of '0'-'9' that is not surrounded by word characters.
As such matches will overlap and Go does not (currently?) support regexp
lookarounds, do the replacement multiple times until there is nothing
more to do. This should not slow down syzkaller, since this code is
only invoked during crash processing.
Restrict LINE replacement only to fragments that have a preceeding file
name. This prevents replacements like [1:2] -> [NUM:LINE].
Diffstat (limited to 'pkg/report/testdata/darwin')
| -rw-r--r-- | pkg/report/testdata/darwin/report/1 | 4 | ||||
| -rw-r--r-- | pkg/report/testdata/darwin/report/3 | 4 | ||||
| -rw-r--r-- | pkg/report/testdata/darwin/report/5 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkg/report/testdata/darwin/report/1 b/pkg/report/testdata/darwin/report/1 index 843fdc5d5..86a4b7790 100644 --- a/pkg/report/testdata/darwin/report/1 +++ b/pkg/report/testdata/darwin/report/1 @@ -1,4 +1,4 @@ -TITLE: panic: Kernel trap type 14=page fault +TITLE: panic: Kernel trap type NUM=page fault panic(cpu 1 caller 0xffffff8002928989): Kernel trap at 0xffffff80021020ba, type 14=page fault, registers: CR0: 0x000000008001003b, CR2: 0x0000000000000000, CR3: 0x0000000008b71000, CR4: 0x00000000000406e0 @@ -32,4 +32,4 @@ Backtrace (CPU 1), Frame : Return Address 0xffffffb04918fda0 : 0xffffff8006eb2882 com.apple.filesystems.apfs : _obj_cache_flush_write + 0xe4 0xffffffb04918fe10 : 0xffffff8006ecd22d com.apple.filesystems.apfs : _tx_flush + 0x3be 0xffffffb04918ff20 : 0xffffff8006eccc4c com.apple.filesystems.apfs : _tx_flush_thread + 0x18b -0xffffffb04918ffa0 : 0xffffff800290881e mach_kernel : _call_continuation + 0x2e
\ No newline at end of file +0xffffffb04918ffa0 : 0xffffff800290881e mach_kernel : _call_continuation + 0x2e diff --git a/pkg/report/testdata/darwin/report/3 b/pkg/report/testdata/darwin/report/3 index 500238c74..5f797f24c 100644 --- a/pkg/report/testdata/darwin/report/3 +++ b/pkg/report/testdata/darwin/report/3 @@ -1,4 +1,4 @@ -TITLE: panic: zalloc: default.kalloc.4096 retry fail 6 +TITLE: panic: zalloc: default.kalloc.NUM retry fail NUM panic(cpu 1 caller 0xffffff8009da2f32): "zalloc: default.kalloc.4096 (357 elements) retry fail 6"@/Users/space/kernel/xnu-7195.81.3/osfmk/kern/zalloc.c:3413 Backtrace (CPU 1), Frame : Return Address @@ -19,4 +19,4 @@ Backtrace (CPU 1), Frame : Return Address 0xffffffa84446fbf0 : 0xffffff8009b8de3d mach_kernel : __ZN11IOCatalogue11findDriversEP9IOServicePi + 0x32d 0xffffffa84446fd50 : 0xffffff8009b14114 mach_kernel : __ZN9IOService14doServiceMatchEj + 0x164 0xffffffa84446fe70 : 0xffffff8009b2ffa2 mach_kernel : __ZN15_IOConfigThread4mainEPvi + 0x4c2 -0xffffffa84446ffa0 : 0xffffff800890881e mach_kernel : _call_continuation + 0x2e
\ No newline at end of file +0xffffffa84446ffa0 : 0xffffff800890881e mach_kernel : _call_continuation + 0x2e diff --git a/pkg/report/testdata/darwin/report/5 b/pkg/report/testdata/darwin/report/5 index e27eb4f8b..a68c2e7bd 100644 --- a/pkg/report/testdata/darwin/report/5 +++ b/pkg/report/testdata/darwin/report/5 @@ -1,4 +1,4 @@ -TITLE: panic: slab_nextptr_panic: mcache.mbuf buffer ADDR in slab ADDR modified after free at offset 0: ADDR out of range [ADDR +TITLE: panic: slab_nextptr_panic: mcache.mbuf buffer ADDR in slab ADDR modified after free at offset NUM: ADDR out of range [AD panic(cpu 0 caller 0xffffff800ac3235c): slab_nextptr_panic: mcache.mbuf buffer 0xffffffa0464b6000 in slab 0xffffffa015c843a0 modified after free at offset 0: 0xccd900000000 out of range [0xffffffa0463a3000-0xffffffa04c3a3000) |