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 03/19] kasan: introduce set_alloc_info Date: Mon, 23 Nov 2020 21:14:33 +0100 [thread overview] Message-ID: <b2393e8f1e311a70fc3aaa2196461b6acdee7d21.1606162397.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1606162397.git.andreyknvl@google.com> Add set_alloc_info() helper and move kasan_set_track() into it. This will simplify the code for one of the upcoming changes. No functional changes. 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/I0316193cbb4ecc9b87b7c2eee0dd79f8ec908c1a --- mm/kasan/common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 8197399b0a1f..0a420f1dbc54 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -327,6 +327,11 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) return __kasan_slab_free(cache, object, ip, true); } +static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) +{ + kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); +} + static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, gfp_t flags, bool keep_tag) { @@ -357,7 +362,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, KASAN_KMALLOC_REDZONE); if (cache->flags & SLAB_KASAN) - kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); + set_alloc_info(cache, (void *)object, flags); return set_tag(object, tag); } -- 2.29.2.454.gaff20da3a2-goog
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-arm-kernel@lists.infradead.org, Marco Elver <elver@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Will Deacon <will.deacon@arm.com>, Branislav Rankov <Branislav.Rankov@arm.com>, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko <glider@google.com>, Evgenii Stepanov <eugenis@google.com>, Andrey Konovalov <andreyknvl@google.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com> Subject: [PATCH mm v4 03/19] kasan: introduce set_alloc_info Date: Mon, 23 Nov 2020 21:14:33 +0100 [thread overview] Message-ID: <b2393e8f1e311a70fc3aaa2196461b6acdee7d21.1606162397.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1606162397.git.andreyknvl@google.com> Add set_alloc_info() helper and move kasan_set_track() into it. This will simplify the code for one of the upcoming changes. No functional changes. 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/I0316193cbb4ecc9b87b7c2eee0dd79f8ec908c1a --- mm/kasan/common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 8197399b0a1f..0a420f1dbc54 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -327,6 +327,11 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) return __kasan_slab_free(cache, object, ip, true); } +static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) +{ + kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); +} + static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, gfp_t flags, bool keep_tag) { @@ -357,7 +362,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, KASAN_KMALLOC_REDZONE); if (cache->flags & SLAB_KASAN) - kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); + set_alloc_info(cache, (void *)object, flags); return set_tag(object, tag); } -- 2.29.2.454.gaff20da3a2-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-23 20:15 UTC|newest] Thread overview: 60+ 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov [this message] 2020-11-23 20:14 ` [PATCH mm v4 03/19] kasan: introduce set_alloc_info Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` [PATCH mm v4 06/19] kasan: remove __kasan_unpoison_stack Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` [PATCH mm v4 14/19] kasan: don't round_up too much Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` 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 ` Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` [PATCH mm v4 19/19] kasan: update documentation Andrey Konovalov 2020-11-23 20:14 ` Andrey Konovalov 2020-11-23 20:14 ` 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=b2393e8f1e311a70fc3aaa2196461b6acdee7d21.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: linkBe 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.