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

UPSTREAM: kasan: introduce complete_report_info

Browse Source 
Introduce a complete_report_info() function that fills in the
first_bad_addr field of kasan_report_info instead of doing it in
kasan_report_*().

This function will be extended in the next patch.

Link: https://lkml.kernel.org/r/8eb1a9bd01f5d31eab4524da54a101b8720b469e.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 015b109f1f7a799a51def6be37a53b650c4a8fda)
Change-Id: I0729c89e04bd675b30849998feb9967475cf240f
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
This commit is contained in:
Andrey Konovalov
2022-09-05 23:05:41 +02:00
parent 6b8566b7a4
commit 4810e13608
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mm/kasan/kasan.h
View File

@@ -159,12 +159,15 @@ enum kasan_report_type {
}; };
struct kasan_report_info { struct kasan_report_info {
/* Filled in by kasan_report_*(). */
enum kasan_report_type type; enum kasan_report_type type;
void *access_addr; void *access_addr;
void *first_bad_addr;
size_t access_size; size_t access_size;
bool is_write; bool is_write;
unsigned long ip; unsigned long ip;
/* Filled in by the common reporting code. */
void *first_bad_addr;
}; };
/* Do not change the struct layout: compiler ABI. */ /* Do not change the struct layout: compiler ABI. */

17
mm/kasan/report.c
View File

@@ -408,6 +408,17 @@ static void print_report(struct kasan_report_info *info)
} }
} }
static void complete_report_info(struct kasan_report_info *info)
{
void *addr = kasan_reset_tag(info->access_addr);
if (info->type == KASAN_REPORT_ACCESS)
info->first_bad_addr = kasan_find_first_bad_addr(
info->access_addr, info->access_size);
else
info->first_bad_addr = addr;
}
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)
{ {
unsigned long flags; unsigned long flags;
@@ -425,11 +436,12 @@ void kasan_report_invalid_free(void *ptr, unsigned long ip, enum kasan_report_ty
info.type = type; info.type = type;
info.access_addr = ptr; info.access_addr = ptr;
info.first_bad_addr = kasan_reset_tag(ptr);
info.access_size = 0; info.access_size = 0;
info.is_write = false; info.is_write = false;
info.ip = ip; info.ip = ip;
complete_report_info(&info);
print_report(&info); print_report(&info);
end_report(&flags, ptr); end_report(&flags, ptr);
@@ -458,11 +470,12 @@ bool kasan_report(unsigned long addr, size_t size, bool is_write,
info.type = KASAN_REPORT_ACCESS; info.type = KASAN_REPORT_ACCESS;
info.access_addr = ptr; info.access_addr = ptr;
info.first_bad_addr = kasan_find_first_bad_addr(ptr, size);
info.access_size = size; info.access_size = size;
info.is_write = is_write; info.is_write = is_write;
info.ip = ip; info.ip = ip;
complete_report_info(&info);
print_report(&info); print_report(&info);
end_report(&irq_flags, ptr); end_report(&irq_flags, ptr);