moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BACKPORT: kasan: fill in cache and object in complete_report_info

Browse Source 
(Backport: conflicts due to folio patchset not backported.)

Add cache and object fields to kasan_report_info and fill them in in
complete_report_info() instead of fetching them in the middle of the
report printing code.

This allows the reporting code to get access to the object information
before starting printing the report.  One of the following patches uses
this information to determine the bug type with the tag-based modes.

Link: https://lkml.kernel.org/r/23264572cb2cbb8f0efbb51509b6757eb3cc1fc9.1662411799.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Peter Collingbourne <pcc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Bug: 254721825
(cherry picked from commit 7fae3dd08e3e88491f06e22e648913e3f8cf30f0)
Change-Id: Id8d7d85876bf15b7e6a42d3893a1156cc06d0271
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
This commit is contained in:
Andrey Konovalov
2022-09-05 23:05:42 +02:00
parent 4810e13608
commit 77a0deb5d5
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mm/kasan/kasan.h
View File

@@ -168,6 +168,8 @@ struct kasan_report_info {
/* Filled in by the common reporting code. */ /* Filled in by the common reporting code. */
void *first_bad_addr; void *first_bad_addr;
struct kmem_cache *cache;
void *object;
}; };
/* Do not change the struct layout: compiler ABI. */ /* Do not change the struct layout: compiler ABI. */

20
mm/kasan/report.c
View File

@@ -283,18 +283,16 @@ static inline bool init_task_stack_addr(const void *addr)
sizeof(init_thread_union.stack)); sizeof(init_thread_union.stack));
} }
static void print_address_description(void *addr, u8 tag) static void print_address_description(void *addr, u8 tag,
struct kasan_report_info *info)
{ {
struct page *page = kasan_addr_to_page(addr); struct page *page = kasan_addr_to_page(addr);
dump_stack_lvl(KERN_ERR); dump_stack_lvl(KERN_ERR);
pr_err("\n"); pr_err("\n");
if (page && PageSlab(page)) { if (info->cache && info->object) {
struct kmem_cache *cache = page->slab_cache; describe_object(info->cache, info->object, addr, tag);
void *object = nearest_obj(cache, page, addr);
describe_object(cache, object, addr, tag);
pr_err("\n"); pr_err("\n");
} }
@@ -401,7 +399,7 @@ static void print_report(struct kasan_report_info *info)
pr_err("\n"); pr_err("\n");
if (addr_has_metadata(addr)) { if (addr_has_metadata(addr)) {
print_address_description(addr, tag); print_address_description(addr, tag, info);
print_memory_metadata(info->first_bad_addr); print_memory_metadata(info->first_bad_addr);
} else { } else {
dump_stack_lvl(KERN_ERR); dump_stack_lvl(KERN_ERR);
@@ -411,12 +409,20 @@ static void print_report(struct kasan_report_info *info)
static void complete_report_info(struct kasan_report_info *info) static void complete_report_info(struct kasan_report_info *info)
{ {
void *addr = kasan_reset_tag(info->access_addr); void *addr = kasan_reset_tag(info->access_addr);
struct page *page;
if (info->type == KASAN_REPORT_ACCESS) if (info->type == KASAN_REPORT_ACCESS)
info->first_bad_addr = kasan_find_first_bad_addr( info->first_bad_addr = kasan_find_first_bad_addr(
info->access_addr, info->access_size); info->access_addr, info->access_size);
else else
info->first_bad_addr = addr; info->first_bad_addr = addr;
page = kasan_addr_to_page(addr);
if (page && page->slab_cache) {
info->cache = page->slab_cache;
info->object = nearest_obj(info->cache, page, addr);
} else
info->cache = info->object = NULL;
} }
void kasan_report_invalid_free(void *ptr, unsigned long ip, enum kasan_report_type type) void kasan_report_invalid_free(void *ptr, unsigned long ip, enum kasan_report_type type)