Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 430a05f9 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds
Browse files

kasan: print page description after stacks 

Moves page description after the stacks since it's less important.

Link: http://lkml.kernel.org/r/20170302134851.101218-8-andreyknvl@google.com


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Acked-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0c06f1f8

mm/kasan/report.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -261,9 +261,6 @@ static void print_address_description(struct kasan_access_info *info) 
	void *addr = (void *)info->access_addr;

	void *addr = (void *)info->access_addr;

	struct page *page = addr_to_page(addr);

	struct page *page = addr_to_page(addr);





	if (page)

		dump_page(page, "kasan: bad access detected");



	dump_stack();

	dump_stack();





	if (page && PageSlab(page)) {

	if (page && PageSlab(page)) {
@@ -273,9 +270,14 @@ static void print_address_description(struct kasan_access_info *info) 
		describe_object(cache, object, addr);

		describe_object(cache, object, addr);

	}

	}





	if (kernel_or_module_addr(addr)) {

	if (kernel_or_module_addr(addr) && !init_task_stack_addr(addr)) {

		if (!init_task_stack_addr(addr))

		pr_err("The buggy address belongs to the variable:\n");

			pr_err("Address belongs to variable %pS\n", addr);

		pr_err(" %pS\n", addr);

	}



	if (page) {

		pr_err("The buggy address belongs to the page:\n");

		dump_page(page, "kasan: bad access detected");

	}

	}

}

}