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/gvisor/report/2 | 2 +- pkg/report/testdata/gvisor/report/4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/report/testdata/gvisor') diff --git a/pkg/report/testdata/gvisor/report/2 b/pkg/report/testdata/gvisor/report/2 index 0783f6112..0acfff6d0 100644 --- a/pkg/report/testdata/gvisor/report/2 +++ b/pkg/report/testdata/gvisor/report/2 @@ -1,4 +1,4 @@ -TITLE: panic: ptrace set regs (&{R15:LINE R14:LINE R13:LINE R12:LINE Rbp:ADDR Rbx:ADDR R11:LINE R10:LINE R9:LINE R8:LINE Rax:LI +TITLE: panic: ptrace set regs (&{R15:NUM R14:NUM R13:NUM R12:NUM Rbp:ADDR Rbx:ADDR R11:NUM R10:NUM R9:NUM R8:NUM Rax:NUM Rcx:AD SUPPRESSED: Y D1212 09:34:24.562123 58684 x:0] [ 1] Restarting syscall 202 after errno 512: interrupted by signal 17 diff --git a/pkg/report/testdata/gvisor/report/4 b/pkg/report/testdata/gvisor/report/4 index 9154887c8..a571b6e10 100644 --- a/pkg/report/testdata/gvisor/report/4 +++ b/pkg/report/testdata/gvisor/report/4 @@ -1,4 +1,4 @@ -TITLE: panic: munmap(ADDR, 0)) failed: invalid argument +TITLE: panic: munmap(ADDR, NUM)) failed: invalid argument perf_event_open(&(0x7f000025c000)={0x2, 0x70, 0x3e4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @perf_bp={&(0x7f0000000100)}}, 0x0, 0xffffffffffffffff, 0xffffffffffffffff, 0x0) bpf$PROG_LOAD(0x5, &(0x7f0000001380)={0x3, 0x2, &(0x7f0000000000)=@raw=[@exit={0x95}], &(0x7f0000000100)='syzkaller\x00', 0x2, 0xb9, &(0x7f00000012c0)=""/185, 0x0, 0x0, [], r1}, 0x48) -- cgit mrf-deployment