Messages in this thread Patch in this message | | | From | <> | Subject | [PATCH v2 1/1] kasan: Add memzero init for unaligned size under SLUB debug | Date | Wed, 23 Jun 2021 21:35:32 +0800 |
| |
From: Yee Lee <yee.lee@mediatek.com>
Issue: when SLUB debug is on, hwtag kasan_unpoison() would overwrite the redzone with unaligned object size.
An additional memzero_explicit() path is added to replacing hwtag initialization at SLUB deubg mode.
Signed-off-by: Yee Lee <yee.lee@mediatek.com> Suggested-by: Marco Elver <elver@google.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Alexander Potapenko <glider@google.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Andrew Morton <akpm@linux-foundation.org> --- mm/kasan/kasan.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index d8faa64614b7..e984a9ac814d 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -387,10 +387,12 @@ static inline void kasan_unpoison(const void *addr, size_t size, bool init) if (WARN_ON((unsigned long)addr & KASAN_GRANULE_MASK)) return; + #if IS_ENABLED(CONFIG_SLUB_DEBUG) if (init && ((unsigned long)size & KASAN_GRANULE_MASK)) { init = false; - memset((void *)addr, 0, size); + memzero_explicit((void *)addr, size); } + #endif size = round_up(size, KASAN_GRANULE_SIZE); hw_set_mem_tag_range((void *)addr, size, tag, init); } -- 2.18.0
| |