All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Dmitry Vyukov <dvyukov@google.com>,
	Alexander Potapenko <glider@google.com>,
	Marco Elver <elver@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>,
	Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Branislav Rankov <Branislav.Rankov@arm.com>,
	Kevin Brodsky <kevin.brodsky@arm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	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 15/20] kasan: don't round_up too much
Date: Thu,  5 Nov 2020 01:02:25 +0100	[thread overview]
Message-ID: <3a3e6dfe3ad355bb5ffc3cc34769cb97aec650d2.1604534322.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1604534322.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>
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 60793f8695a8..69ab880abacc 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -218,9 +218,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object)
 
 void __kasan_poison_object_data(struct kmem_cache *cache, void *object)
 {
-	kasan_poison_memory(object,
-			round_up(cache->object_size, KASAN_GRANULE_SIZE),
-			KASAN_KMALLOC_REDZONE);
+	kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_REDZONE);
 }
 
 /*
@@ -293,7 +291,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;
@@ -314,8 +311,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);
-	kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE);
+	kasan_poison_memory(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 8e4fa9157a0b..3f64c9ecbcc0 100644
--- a/mm/kasan/shadow.c
+++ b/mm/kasan/shadow.c
@@ -82,6 +82,7 @@ void kasan_poison_memory(const void *address, size_t size, u8 value)
 	 * addresses to this function.
 	 */
 	address = kasan_reset_tag(address);
+	size = round_up(size, KASAN_GRANULE_SIZE);
 
 	shadow_start = kasan_mem_to_shadow(address);
 	shadow_end = kasan_mem_to_shadow(address + size);
-- 
2.29.1.341.ge80a0c044ae-goog


WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	 Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Dmitry Vyukov <dvyukov@google.com>,
	 Alexander Potapenko <glider@google.com>,
	Marco Elver <elver@google.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>,
	Andrey Konovalov <andreyknvl@google.com>,
	Kevin Brodsky <kevin.brodsky@arm.com>,
	linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com,
	linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org,
	Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Evgenii Stepanov <eugenis@google.com>
Subject: [PATCH 15/20] kasan: don't round_up too much
Date: Thu,  5 Nov 2020 01:02:25 +0100	[thread overview]
Message-ID: <3a3e6dfe3ad355bb5ffc3cc34769cb97aec650d2.1604534322.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1604534322.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>
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 60793f8695a8..69ab880abacc 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -218,9 +218,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object)
 
 void __kasan_poison_object_data(struct kmem_cache *cache, void *object)
 {
-	kasan_poison_memory(object,
-			round_up(cache->object_size, KASAN_GRANULE_SIZE),
-			KASAN_KMALLOC_REDZONE);
+	kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_REDZONE);
 }
 
 /*
@@ -293,7 +291,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;
@@ -314,8 +311,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);
-	kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE);
+	kasan_poison_memory(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 8e4fa9157a0b..3f64c9ecbcc0 100644
--- a/mm/kasan/shadow.c
+++ b/mm/kasan/shadow.c
@@ -82,6 +82,7 @@ void kasan_poison_memory(const void *address, size_t size, u8 value)
 	 * addresses to this function.
 	 */
 	address = kasan_reset_tag(address);
+	size = round_up(size, KASAN_GRANULE_SIZE);
 
 	shadow_start = kasan_mem_to_shadow(address);
 	shadow_end = kasan_mem_to_shadow(address + size);
-- 
2.29.1.341.ge80a0c044ae-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-05  0:03 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-05  0:02 [PATCH 00/20] kasan: boot parameters for hardware tag-based mode Andrey Konovalov
2020-11-05  0:02 ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 01/20] kasan: simplify quarantine_put call site Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 02/20] kasan: rename get_alloc/free_info Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 03/20] kasan: introduce set_alloc_info Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 04/20] kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 05/20] kasan: allow VMAP_STACK for HW_TAGS mode Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 06/20] kasan: remove __kasan_unpoison_stack Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 07/20] kasan: inline kasan_reset_tag for tag-based modes Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 08/20] kasan: inline random_tag for HW_TAGS Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 09/20] kasan: inline kasan_poison_memory and check_invalid_free Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 10/20] kasan: inline and rename kasan_unpoison_memory Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 11/20] kasan: add and integrate kasan boot parameters Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 12/20] kasan, mm: check kasan_enabled in annotations Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 13/20] kasan: simplify kasan_poison_kfree Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 14/20] kasan, mm: rename kasan_poison_kfree Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` Andrey Konovalov [this message]
2020-11-05  0:02   ` [PATCH 15/20] kasan: don't round_up too much Andrey Konovalov
2020-11-05  0:02 ` [PATCH 16/20] kasan: simplify assign_tag and set_tag calls Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 17/20] kasan: clarify comment in __kasan_kfree_large Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 18/20] kasan: clean up metadata allocation and usage Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 19/20] kasan, mm: allow cache merging with no metadata Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05  0:02 ` [PATCH 20/20] kasan: update documentation Andrey Konovalov
2020-11-05  0:02   ` Andrey Konovalov
2020-11-05 20:49 ` [PATCH 00/20] kasan: boot parameters for hardware tag-based mode Evgenii Stepanov
2020-11-05 20:49   ` Evgenii Stepanov
2020-11-05 20:49   ` Evgenii Stepanov
2020-11-05 20:55   ` Andrey Konovalov
2020-11-05 20:55     ` Andrey Konovalov
2020-11-05 20:55     ` Andrey Konovalov
2020-11-05 22:19     ` Evgenii Stepanov
2020-11-05 22:19       ` Evgenii Stepanov
2020-11-05 22:19       ` Evgenii Stepanov

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=3a3e6dfe3ad355bb5ffc3cc34769cb97aec650d2.1604534322.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.