kasan: don't round_up too much

[linux-2.6-microblaze.git] / mm / kasan / common.c

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index d0f8d7a..e3cfe15 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -213,9 +213,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);
 }
 
 /*
@@ -288,7 +286,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;
@@ -309,8 +306,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;