From d2473bc545f3c562e5876a07e7bf7785bd48e472 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Wed, 7 Feb 2018 13:46:35 +0100
Subject: pkg/report: improve guilty frame extraction

1. Make extractStackFrame more picky about stray frames.
This fixes some TODO's in tests where we matched completley
unrelated frames printed by another task.

2. Extract KASAN guilty frame from report header
if the frame should not be skipped (e.g. not __lock_acquire).
This makes parsing more tolerant to corrupted reports.
---
 pkg/report/testdata/linux/report/196 | 1 -
 pkg/report/testdata/linux/report/197 | 1 -
 pkg/report/testdata/linux/report/198 | 3 +--
 pkg/report/testdata/linux/report/199 | 3 +--
 pkg/report/testdata/linux/report/200 | 3 +--
 5 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'pkg/report/testdata')

diff --git a/pkg/report/testdata/linux/report/196 b/pkg/report/testdata/linux/report/196
index dd3ae765d..042889bc3 100644
--- a/pkg/report/testdata/linux/report/196
+++ b/pkg/report/testdata/linux/report/196
@@ -1,5 +1,4 @@
 TITLE: KASAN: wild-memory-access Read in sg_read
-CORRUPTED: Y
 
 [   67.633749] ==================================================================
 [   67.633767] BUG: KASAN: wild-memory-access in sg_read+0xe5c/0x1440
diff --git a/pkg/report/testdata/linux/report/197 b/pkg/report/testdata/linux/report/197
index 150ef6edb..78ae656db 100644
--- a/pkg/report/testdata/linux/report/197
+++ b/pkg/report/testdata/linux/report/197
@@ -1,5 +1,4 @@
 TITLE: KASAN: global-out-of-bounds Read in show_timer
-CORRUPTED: Y
 
 [   66.768767] ==================================================================
 [   66.776196] BUG: KASAN: global-out-of-bounds in show_timer+0x27a/0x2b0 at addr ffffffff82cda558
diff --git a/pkg/report/testdata/linux/report/198 b/pkg/report/testdata/linux/report/198
index 7c3f1e568..6373ecbcd 100644
--- a/pkg/report/testdata/linux/report/198
+++ b/pkg/report/testdata/linux/report/198
@@ -1,5 +1,4 @@
-# TODO: must be "in ip6t_do_table"
-TITLE: general protection fault in __vmalloc_node_range
+TITLE: general protection fault in ip6t_do_table
 
 [  159.247590] syz-executor6: vmalloc: allocation failure: 8589934588 bytes, mode:0x14080c0(GFP_KERNEL|__GFP_ZERO), nodemask=(null)
 [  159.259380] syz-executor6 cpuset=/ mems_allowed=0
diff --git a/pkg/report/testdata/linux/report/199 b/pkg/report/testdata/linux/report/199
index ea2aa11a8..1c606e5f1 100644
--- a/pkg/report/testdata/linux/report/199
+++ b/pkg/report/testdata/linux/report/199
@@ -1,5 +1,4 @@
-# TODO: must be "in iov_iter_advance".
-TITLE: KASAN: stack-out-of-bounds Read in warn_alloc_failed
+TITLE: KASAN: stack-out-of-bounds Read in iov_iter_advance
 
 [   81.174109] ==================================================================
 [   81.174125] BUG: KASAN: stack-out-of-bounds in iov_iter_advance+0x4c0/0x4f0 at addr ffff8801ca657d38
diff --git a/pkg/report/testdata/linux/report/200 b/pkg/report/testdata/linux/report/200
index 2187f2f03..c30a296e8 100644
--- a/pkg/report/testdata/linux/report/200
+++ b/pkg/report/testdata/linux/report/200
@@ -1,5 +1,4 @@
-# TODO: must be "in ip6t_do_table"
-TITLE: general protection fault in should_fail
+TITLE: general protection fault in ip6t_do_table
 
 [   73.452724] FAULT_INJECTION: forcing a failure.
 [   73.452724] name failslab, interval 1, probability 0, space 0, times 0
-- 
cgit mrf-deployment