diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-01-29 18:41:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-01-29 18:41:34 +1100 |
| commit | 433ac687a018c5ed2572418a263f384c08d6ad18 (patch) | |
| tree | 9ada1230c2b92b1e3534ea33c941cdc5ba32f1c9 /mm/kasan/report.c | |
| parent | 1ce4714d523620b40fdc6ab0f785cdcbd79614f8 (diff) | |
| parent | 7ada87bbb98dfeca138875718ce9caf397bf40ef (diff) | |
| download | linux-next-433ac687a018c5ed2572418a263f384c08d6ad18.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'mm/kasan/report.c')
| -rw-r--r-- | mm/kasan/report.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 410c8235e671..5c169aa688fd 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -5,7 +5,7 @@ * Author: Andrey Ryabinin <ryabinin.a.a@gmail.com> * * Some code borrowed from https://github.com/xairy/kasan-prototype by - * Andrey Konovalov <adech.fo@gmail.com> + * Andrey Konovalov <andreyknvl@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -102,6 +102,10 @@ static const char *get_shadow_bug_type(struct kasan_access_info *info) case KASAN_USE_AFTER_SCOPE: bug_type = "use-after-scope"; break; + case KASAN_ALLOCA_LEFT: + case KASAN_ALLOCA_RIGHT: + bug_type = "alloca-out-of-bounds"; + break; } return bug_type; @@ -322,13 +326,12 @@ static void print_shadow_for_address(const void *addr) } } -void kasan_report_double_free(struct kmem_cache *cache, void *object, - void *ip) +void kasan_report_invalid_free(void *object, unsigned long ip) { unsigned long flags; kasan_start_report(&flags); - pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", ip); + pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", (void *)ip); pr_err("\n"); print_address_description(object); pr_err("\n"); |