Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1591097

[PATCH v2 2/9] kasan: unify report headers

Show all headers | View raw

Unify KASAN report header format for different kinds of bad memory
accesses. Makes the code simpler.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 mm/kasan/report.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 2790b4cadfa3..34a6d1aec524 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -119,16 +119,22 @@ const char *get_wild_bug_type(struct kasan_access_info *info)
 	return bug_type;
 }
 
+static const char *get_bug_type(struct kasan_access_info *info)
+{
+	if (addr_has_shadow(info))
+		return get_shadow_bug_type(info);
+	return get_wild_bug_type(info);
+}
+
 static void print_error_description(struct kasan_access_info *info)
 {
-	const char *bug_type = get_shadow_bug_type(info);
+	const char *bug_type = get_bug_type(info);
 
 	pr_err("BUG: KASAN: %s in %pS at addr %p\n",
-		bug_type, (void *)info->ip,
-		info->access_addr);
+		bug_type, (void *)info->ip, info->access_addr);
 	pr_err("%s of size %zu by task %s/%d\n",
-		info->is_write ? "Write" : "Read",
-		info->access_size, current->comm, task_pid_nr(current));
+		info->is_write ? "Write" : "Read", info->access_size,
+		current->comm, task_pid_nr(current));
 }
 
 static inline bool kernel_or_module_addr(const void *addr)
@@ -295,17 +301,11 @@ static void kasan_report_error(struct kasan_access_info *info)
 
 	kasan_start_report(&flags);
 
+	print_error_description(info);
+
 	if (!addr_has_shadow(info)) {
-		const char *bug_type = get_wild_bug_type(info);
-		pr_err("BUG: KASAN: %s on address %p\n",
-			bug_type, info->access_addr);
-		pr_err("%s of size %zu by task %s/%d\n",
-			info->is_write ? "Write" : "Read",
-			info->access_size, current->comm,
-			task_pid_nr(current));
 		dump_stack();
 	} else {
-		print_error_description(info);
 		print_address_description(info);
 		print_shadow_for_address(info->first_bad_addr);
 	}
-- 
2.12.0.rc1.440.g5b76565f74-goog

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] kasan: improve error reports Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 14:50 +0100
  [PATCH v2 7/9] kasan: print page description after stacks Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 15:00 +0100
  [PATCH v2 1/9] kasan: introduce helper functions for determining bug type Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 15:00 +0100
    Re: [PATCH v2 1/9] kasan: introduce helper functions for determining  bug type Alexander Potapenko <glider@google.com> - 2017-03-02 19:30 +0100
  [PATCH v2 2/9] kasan: unify report headers Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 15:00 +0100
  [PATCH v2 5/9] kasan: change report header Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 15:00 +0100
    Re: [PATCH v2 5/9] kasan: change report header Andrey Konovalov <andreyknvl@google.com> - 2017-03-03 15:20 +0100
      Re: [PATCH v2 5/9] kasan: change report header Andrey Konovalov <andreyknvl@google.com> - 2017-03-03 15:30 +0100
  [PATCH v2 9/9] kasan: separate report parts by empty lines Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 15:00 +0100
  [PATCH v2 4/9] kasan: simplify address description logic Andrey Konovalov <andreyknvl@google.com> - 2017-03-02 15:00 +0100
  Re: [PATCH v2 0/9] kasan: improve error reports Dmitry Vyukov <dvyukov@google.com> - 2017-03-02 15:10 +0100

csiph-web