diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2022-03-25 04:12:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-25 05:06:49 +0300 |
| commit | b91328002d266da3f53703f753b3a2af0dc9b9c1 (patch) | |
| tree | faccbd63f5724eddd83c4054c9c4973a5de2aba6 /mm/kasan/report_sw_tags.c | |
| parent | 9d7b7dd946924de43021f57a8bee122ff0744d93 (diff) | |
| download | linux-b91328002d266da3f53703f753b3a2af0dc9b9c1.tar.xz | |
kasan: simplify kasan_find_first_bad_addr call sites
Move the addr_has_metadata() check into kasan_find_first_bad_addr().
Link: https://lkml.kernel.org/r/a49576f7a23283d786ba61579cb0c5057e8f0b9b.1646237226.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/kasan/report_sw_tags.c')
| -rw-r--r-- | mm/kasan/report_sw_tags.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/kasan/report_sw_tags.c b/mm/kasan/report_sw_tags.c index 7271f0988fc0..7a26397297ed 100644 --- a/mm/kasan/report_sw_tags.c +++ b/mm/kasan/report_sw_tags.c @@ -36,8 +36,12 @@ void *kasan_find_first_bad_addr(void *addr, size_t size) void *p = kasan_reset_tag(addr); void *end = p + size; + if (!addr_has_metadata(p)) + return p; + while (p < end && tag == *(u8 *)kasan_mem_to_shadow(p)) p += KASAN_GRANULE_SIZE; + return p; } |