From: Andrey Konovalov <andreyknvl@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Vincenzo Frascino <vincenzo.frascino@arm.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>,
Branislav Rankov <Branislav.Rankov@arm.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH mm v4 14/19] kasan: don't round_up too much
Date: Mon, 23 Nov 2020 21:14:44 +0100 [thread overview]
Message-ID: <47b232474f1f89dc072aeda0fa58daa6efade377.1606162397.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1606162397.git.andreyknvl@google.com>
For hardware tag-based mode kasan_poison_memory() already rounds up the
size. Do the same for software modes and remove round_up() from the common
code.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Link: https://linux-review.googlesource.com/id/Ib397128fac6eba874008662b4964d65352db4aa4
---
mm/kasan/common.c | 8 ++------
mm/kasan/shadow.c | 1 +
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 1205faac90bd..1a88e4005181 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -214,9 +214,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object)
void __kasan_poison_object_data(struct kmem_cache *cache, void *object)
{
- poison_range(object,
- round_up(cache->object_size, KASAN_GRANULE_SIZE),
- KASAN_KMALLOC_REDZONE);
+ poison_range(object, cache->object_size, KASAN_KMALLOC_REDZONE);
}
/*
@@ -289,7 +287,6 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
{
u8 tag;
void *tagged_object;
- unsigned long rounded_up_size;
tag = get_tag(object);
tagged_object = object;
@@ -313,8 +310,7 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
return true;
}
- rounded_up_size = round_up(cache->object_size, KASAN_GRANULE_SIZE);
- poison_range(object, rounded_up_size, KASAN_KMALLOC_FREE);
+ poison_range(object, cache->object_size, KASAN_KMALLOC_FREE);
if (!kasan_stack_collection_enabled())
return false;
diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c
index 37153bd1c126..e9efe88f7679 100644
--- a/mm/kasan/shadow.c
+++ b/mm/kasan/shadow.c
@@ -83,6 +83,7 @@ void poison_range(const void *address, size_t size, u8 value)
* addresses to this function.
*/
address = kasan_reset_tag(address);
+ size = round_up(size, KASAN_GRANULE_SIZE);
/* Skip KFENCE memory if called explicitly outside of sl*b. */
if (is_kfence_address(address))
--
2.29.2.454.gaff20da3a2-goog
next prev parent reply other threads:[~2020-11-23 20:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 20:14 [PATCH mm v4 00/19] kasan: boot parameters for hardware tag-based mode Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 01/19] kasan: simplify quarantine_put call site Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 02/19] kasan: rename get_alloc/free_info Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 03/19] kasan: introduce set_alloc_info Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 04/19] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 05/19] kasan: allow VMAP_STACK for HW_TAGS mode Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 06/19] kasan: remove __kasan_unpoison_stack Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 07/19] kasan: inline kasan_reset_tag for tag-based modes Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 08/19] kasan: inline random_tag for HW_TAGS Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 09/19] kasan: open-code kasan_unpoison_slab Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 10/19] kasan: inline (un)poison_range and check_invalid_free Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 11/19] kasan: add and integrate kasan boot parameters Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 12/19] kasan, mm: check kasan_enabled in annotations Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 13/19] kasan, mm: rename kasan_poison_kfree Andrey Konovalov
2020-11-23 20:14 ` Andrey Konovalov [this message]
2020-11-23 20:14 ` [PATCH mm v4 15/19] kasan: simplify assign_tag and set_tag calls Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 16/19] kasan: clarify comment in __kasan_kfree_large Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 17/19] kasan: sanitize objects when metadata doesn't fit Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 18/19] kasan, mm: allow cache merging with no metadata Andrey Konovalov
2020-11-23 20:14 ` [PATCH mm v4 19/19] kasan: update documentation 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=47b232474f1f89dc072aeda0fa58daa6efade377.1606162397.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=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).