Commit cdf6a273 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds

kasan: accurately determine the type of the bad access

Makes KASAN accurately determine the type of the bad access. If the shadow
byte value is in the [0, KASAN_SHADOW_SCALE_SIZE) range we can look at
the next shadow byte to determine the type of the access.
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Konstantin Serebryany <kcc@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0952d87f
...@@ -50,15 +50,26 @@ static const void *find_first_bad_addr(const void *addr, size_t size) ...@@ -50,15 +50,26 @@ static const void *find_first_bad_addr(const void *addr, size_t size)
static void print_error_description(struct kasan_access_info *info) static void print_error_description(struct kasan_access_info *info)
{ {
const char *bug_type = "unknown-crash"; const char *bug_type = "unknown-crash";
u8 shadow_val; u8 *shadow_addr;
info->first_bad_addr = find_first_bad_addr(info->access_addr, info->first_bad_addr = find_first_bad_addr(info->access_addr,
info->access_size); info->access_size);
shadow_val = *(u8 *)kasan_mem_to_shadow(info->first_bad_addr); shadow_addr = (u8 *)kasan_mem_to_shadow(info->first_bad_addr);
switch (shadow_val) { /*
* If shadow byte value is in [0, KASAN_SHADOW_SCALE_SIZE) we can look
* at the next shadow byte to determine the type of the bad access.
*/
if (*shadow_addr > 0 && *shadow_addr <= KASAN_SHADOW_SCALE_SIZE - 1)
shadow_addr++;
switch (*shadow_addr) {
case 0 ... KASAN_SHADOW_SCALE_SIZE - 1: case 0 ... KASAN_SHADOW_SCALE_SIZE - 1:
/*
* In theory it's still possible to see these shadow values
* due to a data race in the kernel code.
*/
bug_type = "out-of-bounds"; bug_type = "out-of-bounds";
break; break;
case KASAN_PAGE_REDZONE: case KASAN_PAGE_REDZONE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment