From 2489ab887a86e8b1b253aef742e365a606db3a4f Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 3 Aug 2021 18:03:25 +0000 Subject: 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]. --- pkg/report/testdata/freebsd/report/0 | 2 +- pkg/report/testdata/freebsd/report/1 | 2 +- pkg/report/testdata/freebsd/report/14 | 2 +- pkg/report/testdata/freebsd/report/15 | 2 +- pkg/report/testdata/freebsd/report/2 | 2 +- pkg/report/testdata/freebsd/report/5 | 2 +- pkg/report/testdata/freebsd/report/6 | 2 +- pkg/report/testdata/freebsd/report/7 | 2 +- pkg/report/testdata/freebsd/report/8 | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkg/report/testdata/freebsd') diff --git a/pkg/report/testdata/freebsd/report/0 b/pkg/report/testdata/freebsd/report/0 index b822a6093..ae0fb7641 100644 --- a/pkg/report/testdata/freebsd/report/0 +++ b/pkg/report/testdata/freebsd/report/0 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 12: page fault while in kernel mode in atrtc_settime +TITLE: Fatal trap NUM: page fault while in kernel mode in atrtc_settime Fatal trap 12: page fault while in kernel mode cpuid = 0; apic id = 00 diff --git a/pkg/report/testdata/freebsd/report/1 b/pkg/report/testdata/freebsd/report/1 index eac4a02e4..de4de6cac 100644 --- a/pkg/report/testdata/freebsd/report/1 +++ b/pkg/report/testdata/freebsd/report/1 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 12: page fault while in kernel mode in sctp_sosend +TITLE: Fatal trap NUM: page fault while in kernel mode in sctp_sosend Fatal trap 12: page fault while in kernel mode cpuid = 3; apic id = 03 diff --git a/pkg/report/testdata/freebsd/report/14 b/pkg/report/testdata/freebsd/report/14 index c3b7b5bd3..35ab866b7 100644 --- a/pkg/report/testdata/freebsd/report/14 +++ b/pkg/report/testdata/freebsd/report/14 @@ -1,4 +1,4 @@ -TITLE: panic: ASan: Invalid access, 16-byte read in aesni_encrypt_icm +TITLE: panic: ASan: Invalid access, NUM-byte read in aesni_encrypt_icm panic: ASan: Invalid access, 16-byte read at 0xfffffe000793dd20, RedZonePartial(5) cpuid = 0 diff --git a/pkg/report/testdata/freebsd/report/15 b/pkg/report/testdata/freebsd/report/15 index 77cac4040..5b81f2329 100644 --- a/pkg/report/testdata/freebsd/report/15 +++ b/pkg/report/testdata/freebsd/report/15 @@ -1,4 +1,4 @@ -TITLE: panic: ASan: Invalid access, 1-byte write in strlcpy +TITLE: panic: ASan: Invalid access, NUM-byte write in strlcpy panic: ASan: Invalid access, 1-byte write at 0xfffffe0057414be0, MallocRedZone(fb) cpuid = 1 diff --git a/pkg/report/testdata/freebsd/report/2 b/pkg/report/testdata/freebsd/report/2 index 38df1b467..068beb3b7 100644 --- a/pkg/report/testdata/freebsd/report/2 +++ b/pkg/report/testdata/freebsd/report/2 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 9: general protection fault while in kernel mode in udp_close +TITLE: Fatal trap NUM: general protection fault while in kernel mode in udp_close Fatal trap 9: general protection fault while in kernel mode cpuid = 0; apic id = 00 diff --git a/pkg/report/testdata/freebsd/report/5 b/pkg/report/testdata/freebsd/report/5 index dcb9f7e6e..640554141 100644 --- a/pkg/report/testdata/freebsd/report/5 +++ b/pkg/report/testdata/freebsd/report/5 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 9: general protection fault in unp_dispose +TITLE: Fatal trap NUM: general protection fault in unp_dispose Fatal trap 9: general protection fault while in kernel mode cpuid = 0; apic id = 00 diff --git a/pkg/report/testdata/freebsd/report/6 b/pkg/report/testdata/freebsd/report/6 index 3f7093f78..098aa93ed 100644 --- a/pkg/report/testdata/freebsd/report/6 +++ b/pkg/report/testdata/freebsd/report/6 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 9: general protection fault in sctp_inpcb_bind +TITLE: Fatal trap NUM: general protection fault in sctp_inpcb_bind Fatal trap 9: general protection fault while in kernel mode cpuid = 0; apic id = 00 diff --git a/pkg/report/testdata/freebsd/report/7 b/pkg/report/testdata/freebsd/report/7 index 9c3ece63c..402e36602 100644 --- a/pkg/report/testdata/freebsd/report/7 +++ b/pkg/report/testdata/freebsd/report/7 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 12: page fault in vm_page_unhold_pages +TITLE: Fatal trap NUM: page fault in vm_page_unhold_pages Fatal trap 12: page fault while in kernel mode cpuid = 0; apic id = 00 diff --git a/pkg/report/testdata/freebsd/report/8 b/pkg/report/testdata/freebsd/report/8 index d8c99cb6e..c62fa7993 100644 --- a/pkg/report/testdata/freebsd/report/8 +++ b/pkg/report/testdata/freebsd/report/8 @@ -1,4 +1,4 @@ -TITLE: Fatal trap 12: page fault in inp_freemoptions +TITLE: Fatal trap NUM: page fault in inp_freemoptions Fatal trap 12: page fault while in kernel mode cpuid = 0; apic id = 00 -- cgit mrf-deployment