lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/32] kasan: move is_kmalloc check out of save_alloc_info
    Date
    From: Andrey Konovalov <andreyknvl@google.com>

    Move kasan_info.is_kmalloc check out of save_alloc_info().

    This is a preparatory change that simplifies the following patches
    in this series.

    Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
    ---
    mm/kasan/common.c | 15 +++++----------
    1 file changed, 5 insertions(+), 10 deletions(-)

    diff --git a/mm/kasan/common.c b/mm/kasan/common.c
    index 753775b894b6..a6107e8375e0 100644
    --- a/mm/kasan/common.c
    +++ b/mm/kasan/common.c
    @@ -423,15 +423,10 @@ void __kasan_slab_free_mempool(void *ptr, unsigned long ip)
    }
    }

    -static void save_alloc_info(struct kmem_cache *cache, void *object,
    - gfp_t flags, bool is_kmalloc)
    +static void save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
    {
    struct kasan_alloc_meta *alloc_meta;

    - /* Don't save alloc info for kmalloc caches in kasan_slab_alloc(). */
    - if (cache->kasan_info.is_kmalloc && !is_kmalloc)
    - return;
    -
    alloc_meta = kasan_get_alloc_meta(cache, object);
    if (alloc_meta)
    kasan_set_track(&alloc_meta->alloc_track, flags);
    @@ -466,8 +461,8 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache,
    kasan_unpoison(tagged_object, cache->object_size, init);

    /* Save alloc info (if possible) for non-kmalloc() allocations. */
    - if (kasan_stack_collection_enabled())
    - save_alloc_info(cache, (void *)object, flags, false);
    + if (kasan_stack_collection_enabled() && !cache->kasan_info.is_kmalloc)
    + save_alloc_info(cache, (void *)object, flags);

    return tagged_object;
    }
    @@ -512,8 +507,8 @@ static inline void *____kasan_kmalloc(struct kmem_cache *cache,
    * Save alloc info (if possible) for kmalloc() allocations.
    * This also rewrites the alloc info when called from kasan_krealloc().
    */
    - if (kasan_stack_collection_enabled())
    - save_alloc_info(cache, (void *)object, flags, true);
    + if (kasan_stack_collection_enabled() && cache->kasan_info.is_kmalloc)
    + save_alloc_info(cache, (void *)object, flags);

    /* Keep the tag that was set by kasan_slab_alloc(). */
    return (void *)object;
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-06-13 22:55    [W:4.378 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site