From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>,
kasan-dev@googlegroups.com, Dmitry Vyukov <dvyukov@google.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Evgenii Stepanov <eugenis@google.com>,
Elena Petrova <lenaptr@google.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v5 14/40] kasan: rename (un)poison_shadow to (un)poison_memory
Date: Mon, 12 Oct 2020 22:44:20 +0200 [thread overview]
Message-ID: <d95da14e2c31c5c110a9720fc7f4aed781e3bb2e.1602535397.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1602535397.git.andreyknvl@google.com>
This is a preparatory commit for the upcoming addition of a new hardware
tag-based (MTE-based) KASAN mode.
The new mode won't be using shadow memory, but will reuse the same
functions. Rename kasan_unpoison_shadow to kasan_unpoison_memory,
and kasan_poison_shadow to kasan_poison_memory.
No functional changes.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Marco Elver <elver@google.com>
---
Change-Id: Ia359f32815242c4704e49a5f1639ca2d2f8cba69
---
include/linux/kasan.h | 6 +++---
kernel/fork.c | 4 ++--
mm/kasan/common.c | 38 +++++++++++++++++++-------------------
mm/kasan/generic.c | 12 ++++++------
mm/kasan/kasan.h | 2 +-
mm/kasan/tags.c | 2 +-
mm/slab_common.c | 2 +-
7 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index 1ff2717a8547..c07175e6ad76 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -63,7 +63,7 @@ extern void kasan_enable_current(void);
/* Disable reporting bugs for current task */
extern void kasan_disable_current(void);
-void kasan_unpoison_shadow(const void *address, size_t size);
+void kasan_unpoison_memory(const void *address, size_t size);
void kasan_unpoison_task_stack(struct task_struct *task);
@@ -100,7 +100,7 @@ struct kasan_cache {
size_t __ksize(const void *);
static inline void kasan_unpoison_slab(const void *ptr)
{
- kasan_unpoison_shadow(ptr, __ksize(ptr));
+ kasan_unpoison_memory(ptr, __ksize(ptr));
}
size_t kasan_metadata_size(struct kmem_cache *cache);
@@ -109,7 +109,7 @@ void kasan_restore_multi_shot(bool enabled);
#else /* CONFIG_KASAN */
-static inline void kasan_unpoison_shadow(const void *address, size_t size) {}
+static inline void kasan_unpoison_memory(const void *address, size_t size) {}
static inline void kasan_unpoison_task_stack(struct task_struct *task) {}
diff --git a/kernel/fork.c b/kernel/fork.c
index 4d32190861bd..b41fecca59d7 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -224,8 +224,8 @@ static unsigned long *alloc_thread_stack_node(struct task_struct *tsk, int node)
if (!s)
continue;
- /* Clear the KASAN shadow of the stack. */
- kasan_unpoison_shadow(s->addr, THREAD_SIZE);
+ /* Mark stack accessible for KASAN. */
+ kasan_unpoison_memory(s->addr, THREAD_SIZE);
/* Clear stale pointers from reused stack. */
memset(s->addr, 0, THREAD_SIZE);
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 89e5ef9417a7..a4b73fa0dd7e 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -108,7 +108,7 @@ void *memcpy(void *dest, const void *src, size_t len)
* Poisons the shadow memory for 'size' bytes starting from 'addr'.
* Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE.
*/
-void kasan_poison_shadow(const void *address, size_t size, u8 value)
+void kasan_poison_memory(const void *address, size_t size, u8 value)
{
void *shadow_start, *shadow_end;
@@ -125,7 +125,7 @@ void kasan_poison_shadow(const void *address, size_t size, u8 value)
__memset(shadow_start, value, shadow_end - shadow_start);
}
-void kasan_unpoison_shadow(const void *address, size_t size)
+void kasan_unpoison_memory(const void *address, size_t size)
{
u8 tag = get_tag(address);
@@ -136,7 +136,7 @@ void kasan_unpoison_shadow(const void *address, size_t size)
*/
address = reset_tag(address);
- kasan_poison_shadow(address, size, tag);
+ kasan_poison_memory(address, size, tag);
if (size & KASAN_SHADOW_MASK) {
u8 *shadow = (u8 *)kasan_mem_to_shadow(address + size);
@@ -153,7 +153,7 @@ static void __kasan_unpoison_stack(struct task_struct *task, const void *sp)
void *base = task_stack_page(task);
size_t size = sp - base;
- kasan_unpoison_shadow(base, size);
+ kasan_unpoison_memory(base, size);
}
/* Unpoison the entire stack for a task. */
@@ -172,7 +172,7 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark)
*/
void *base = (void *)((unsigned long)watermark & ~(THREAD_SIZE - 1));
- kasan_unpoison_shadow(base, watermark - base);
+ kasan_unpoison_memory(base, watermark - base);
}
void kasan_alloc_pages(struct page *page, unsigned int order)
@@ -186,13 +186,13 @@ void kasan_alloc_pages(struct page *page, unsigned int order)
tag = random_tag();
for (i = 0; i < (1 << order); i++)
page_kasan_tag_set(page + i, tag);
- kasan_unpoison_shadow(page_address(page), PAGE_SIZE << order);
+ kasan_unpoison_memory(page_address(page), PAGE_SIZE << order);
}
void kasan_free_pages(struct page *page, unsigned int order)
{
if (likely(!PageHighMem(page)))
- kasan_poison_shadow(page_address(page),
+ kasan_poison_memory(page_address(page),
PAGE_SIZE << order,
KASAN_FREE_PAGE);
}
@@ -284,18 +284,18 @@ void kasan_poison_slab(struct page *page)
for (i = 0; i < compound_nr(page); i++)
page_kasan_tag_reset(page + i);
- kasan_poison_shadow(page_address(page), page_size(page),
+ kasan_poison_memory(page_address(page), page_size(page),
KASAN_KMALLOC_REDZONE);
}
void kasan_unpoison_object_data(struct kmem_cache *cache, void *object)
{
- kasan_unpoison_shadow(object, cache->object_size);
+ kasan_unpoison_memory(object, cache->object_size);
}
void kasan_poison_object_data(struct kmem_cache *cache, void *object)
{
- kasan_poison_shadow(object,
+ kasan_poison_memory(object,
round_up(cache->object_size, KASAN_SHADOW_SCALE_SIZE),
KASAN_KMALLOC_REDZONE);
}
@@ -408,7 +408,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object,
}
rounded_up_size = round_up(cache->object_size, KASAN_SHADOW_SCALE_SIZE);
- kasan_poison_shadow(object, rounded_up_size, KASAN_KMALLOC_FREE);
+ kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE);
if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) ||
unlikely(!(cache->flags & SLAB_KASAN)))
@@ -448,8 +448,8 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object,
tag = assign_tag(cache, object, false, keep_tag);
/* Tag is ignored in set_tag without CONFIG_KASAN_SW_TAGS */
- kasan_unpoison_shadow(set_tag(object, tag), size);
- kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
+ kasan_unpoison_memory(set_tag(object, tag), size);
+ kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start,
KASAN_KMALLOC_REDZONE);
if (cache->flags & SLAB_KASAN)
@@ -489,8 +489,8 @@ void * __must_check kasan_kmalloc_large(const void *ptr, size_t size,
KASAN_SHADOW_SCALE_SIZE);
redzone_end = (unsigned long)ptr + page_size(page);
- kasan_unpoison_shadow(ptr, size);
- kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
+ kasan_unpoison_memory(ptr, size);
+ kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start,
KASAN_PAGE_REDZONE);
return (void *)ptr;
@@ -523,7 +523,7 @@ void kasan_poison_kfree(void *ptr, unsigned long ip)
kasan_report_invalid_free(ptr, ip);
return;
}
- kasan_poison_shadow(ptr, page_size(page), KASAN_FREE_PAGE);
+ kasan_poison_memory(ptr, page_size(page), KASAN_FREE_PAGE);
} else {
__kasan_slab_free(page->slab_cache, ptr, ip, false);
}
@@ -709,7 +709,7 @@ int kasan_populate_vmalloc(unsigned long addr, unsigned long size)
* // vmalloc() allocates memory
* // let a = area->addr
* // we reach kasan_populate_vmalloc
- * // and call kasan_unpoison_shadow:
+ * // and call kasan_unpoison_memory:
* STORE shadow(a), unpoison_val
* ...
* STORE shadow(a+99), unpoison_val x = LOAD p
@@ -744,7 +744,7 @@ void kasan_poison_vmalloc(const void *start, unsigned long size)
return;
size = round_up(size, KASAN_SHADOW_SCALE_SIZE);
- kasan_poison_shadow(start, size, KASAN_VMALLOC_INVALID);
+ kasan_poison_memory(start, size, KASAN_VMALLOC_INVALID);
}
void kasan_unpoison_vmalloc(const void *start, unsigned long size)
@@ -752,7 +752,7 @@ void kasan_unpoison_vmalloc(const void *start, unsigned long size)
if (!is_vmalloc_or_module_addr(start))
return;
- kasan_unpoison_shadow(start, size);
+ kasan_unpoison_memory(start, size);
}
static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr,
diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c
index 37ccfadd3263..7006157c674b 100644
--- a/mm/kasan/generic.c
+++ b/mm/kasan/generic.c
@@ -202,9 +202,9 @@ static void register_global(struct kasan_global *global)
{
size_t aligned_size = round_up(global->size, KASAN_SHADOW_SCALE_SIZE);
- kasan_unpoison_shadow(global->beg, global->size);
+ kasan_unpoison_memory(global->beg, global->size);
- kasan_poison_shadow(global->beg + aligned_size,
+ kasan_poison_memory(global->beg + aligned_size,
global->size_with_redzone - aligned_size,
KASAN_GLOBAL_REDZONE);
}
@@ -285,11 +285,11 @@ void __asan_alloca_poison(unsigned long addr, size_t size)
WARN_ON(!IS_ALIGNED(addr, KASAN_ALLOCA_REDZONE_SIZE));
- kasan_unpoison_shadow((const void *)(addr + rounded_down_size),
+ kasan_unpoison_memory((const void *)(addr + rounded_down_size),
size - rounded_down_size);
- kasan_poison_shadow(left_redzone, KASAN_ALLOCA_REDZONE_SIZE,
+ kasan_poison_memory(left_redzone, KASAN_ALLOCA_REDZONE_SIZE,
KASAN_ALLOCA_LEFT);
- kasan_poison_shadow(right_redzone,
+ kasan_poison_memory(right_redzone,
padding_size + KASAN_ALLOCA_REDZONE_SIZE,
KASAN_ALLOCA_RIGHT);
}
@@ -301,7 +301,7 @@ void __asan_allocas_unpoison(const void *stack_top, const void *stack_bottom)
if (unlikely(!stack_top || stack_top > stack_bottom))
return;
- kasan_unpoison_shadow(stack_top, stack_bottom - stack_top);
+ kasan_unpoison_memory(stack_top, stack_bottom - stack_top);
}
EXPORT_SYMBOL(__asan_allocas_unpoison);
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 633f8902e5e2..01b943bd49c8 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -150,7 +150,7 @@ static inline bool addr_has_shadow(const void *addr)
return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
}
-void kasan_poison_shadow(const void *address, size_t size, u8 value);
+void kasan_poison_memory(const void *address, size_t size, u8 value);
/**
* check_memory_region - Check memory region, and report if invalid access.
diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c
index 5c8b08a25715..4bdd7dbd6647 100644
--- a/mm/kasan/tags.c
+++ b/mm/kasan/tags.c
@@ -153,7 +153,7 @@ EXPORT_SYMBOL(__hwasan_storeN_noabort);
void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size)
{
- kasan_poison_shadow((void *)addr, size, tag);
+ kasan_poison_memory((void *)addr, size, tag);
}
EXPORT_SYMBOL(__hwasan_tag_memory);
diff --git a/mm/slab_common.c b/mm/slab_common.c
index f9ccd5dc13f3..53d0f8bb57ea 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -1176,7 +1176,7 @@ size_t ksize(const void *objp)
* We assume that ksize callers could use whole allocated area,
* so we need to unpoison this area.
*/
- kasan_unpoison_shadow(objp, size);
+ kasan_unpoison_memory(objp, size);
return size;
}
EXPORT_SYMBOL(ksize);
--
2.28.0.1011.ga647a8990f-goog
next prev parent reply other threads:[~2020-10-12 20:46 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 20:44 [PATCH v5 00/40] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 01/40] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 02/40] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-10-28 11:28 ` Dmitry Vyukov
2020-10-29 16:50 ` Andrey Konovalov
2020-11-04 17:49 ` Vincenzo Frascino
2020-10-12 20:44 ` [PATCH v5 03/40] arm64: mte: Reset the page tag in page->flags Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 04/40] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 05/40] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 06/40] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 07/40] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 08/40] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-10-28 10:06 ` Dmitry Vyukov
2020-10-29 16:52 ` Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 09/40] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 10/40] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 11/40] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 12/40] kasan: group vmalloc code Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 13/40] kasan: shadow declarations only for software modes Andrey Konovalov
2020-10-12 20:44 ` Andrey Konovalov [this message]
2020-10-12 20:44 ` [PATCH v5 15/40] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 16/40] kasan: only build init.c for software modes Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 17/40] kasan: split out shadow.c from common.c Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 18/40] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 19/40] kasan: rename report and tags files Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 20/40] kasan: don't duplicate config dependencies Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 21/40] kasan: hide invalid free check implementation Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 22/40] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 23/40] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 24/40] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 25/40] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 26/40] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 27/40] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 28/40] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 29/40] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 30/40] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 31/40] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 32/40] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 33/40] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 34/40] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 35/40] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 36/40] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 37/40] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 38/40] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 39/40] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 40/40] kselftest/arm64: Check GCR_EL1 after context switch Andrey Konovalov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d95da14e2c31c5c110a9720fc7f4aed781e3bb2e.1602535397.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Branislav.Rankov@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=kevin.brodsky@arm.com \
--cc=lenaptr@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=vincenzo.frascino@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).