From: Andrey Konovalov <andreyknvl@google.com>
To: Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Christoph Lameter <cl@linux.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mark Rutland <mark.rutland@arm.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Dave Martin <dave.martin@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Ingo Molnar <mingo@kernel.org>,
Paul Lawrence <paullawrence@google.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Arnd Bergmann <arnd@arndb.de>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kate Stewart <kstewart@linuxfoundation.org>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
kasan-dev@googlegroups.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sparse@vger.kernel.org, linux-mm@kvack.org,
linux-kbuild@vger.kernel.org
Cc: Kostya Serebryany <kcc@google.com>,
Evgeniy Stepanov <eugenis@google.com>,
Lee Smith <Lee.Smith@arm.com>,
Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>,
Jacob Bramley <Jacob.Bramley@arm.com>,
Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>,
Jann Horn <jannh@google.com>, Mark Brand <markbrand@google.com>,
Chintan Pandya <cpandya@codeaurora.org>,
Vishwath Mohan <vishwath@google.com>,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v11 02/24] kasan, slub: handle pointer tags in early_kmem_cache_node_alloc
Date: Mon, 19 Nov 2018 18:26:18 +0100 [thread overview]
Message-ID: <14a68774683e15692615600c47bba53506a1c8ef.1542648335.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1542648335.git.andreyknvl@google.com>
The previous patch updated KASAN hooks signatures and their usage in SLAB
and SLUB code, except for the early_kmem_cache_node_alloc function. This
patch handles that function separately, as it requires to reorder some of
the initialization code to correctly propagate a tagged pointer in case a
tag is assigned by kasan_kmalloc.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
mm/slub.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index fdd4a86aa882..8561a32910dd 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3364,16 +3364,16 @@ static void early_kmem_cache_node_alloc(int node)
n = page->freelist;
BUG_ON(!n);
- page->freelist = get_freepointer(kmem_cache_node, n);
- page->inuse = 1;
- page->frozen = 0;
- kmem_cache_node->node[node] = n;
#ifdef CONFIG_SLUB_DEBUG
init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);
init_tracking(kmem_cache_node, n);
#endif
- kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node),
+ n = kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node),
GFP_KERNEL);
+ page->freelist = get_freepointer(kmem_cache_node, n);
+ page->inuse = 1;
+ page->frozen = 0;
+ kmem_cache_node->node[node] = n;
init_kmem_cache_node(n);
inc_slabs_node(kmem_cache_node, node, page->objects);
--
2.19.1.1215.g8438c0b245-goog
next prev parent reply other threads:[~2018-11-19 17:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 17:26 [PATCH v11 00/24] kasan: add software tag-based mode for arm64 Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 01/24] kasan, mm: change hooks signatures Andrey Konovalov
2018-11-19 17:26 ` Andrey Konovalov [this message]
2018-11-19 17:26 ` [PATCH v11 03/24] kasan: move common generic and tag-based code to common.c Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 04/24] kasan: rename source files to reflect the new naming scheme Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 05/24] kasan: add CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS Andrey Konovalov
2018-11-23 17:43 ` Mark Rutland
2018-11-27 16:12 ` Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 06/24] kasan, arm64: adjust shadow size for tag-based mode Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 07/24] kasan: rename kasan_zero_page to kasan_early_shadow_page Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 08/24] kasan: initialize shadow to 0xff for tag-based mode Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 09/24] arm64: move untagged_addr macro from uaccess.h to memory.h Andrey Konovalov
2018-11-23 17:37 ` Mark Rutland
2018-11-27 16:04 ` Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 10/24] kasan: add tag related helper functions Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 11/24] kasan, arm64: untag address in _virt_addr_is_linear Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 12/24] kasan: preassign tags to objects with ctors or SLAB_TYPESAFE_BY_RCU Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 13/24] kasan, arm64: fix up fault handling logic Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 14/24] kasan, arm64: enable top byte ignore for the kernel Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 15/24] kasan, mm: perform untagged pointers comparison in krealloc Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 16/24] kasan: split out generic_report.c from report.c Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 17/24] kasan: add bug reporting routines for tag-based mode Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 18/24] mm: move obj_to_index to include/linux/slab_def.h Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 19/24] kasan: add hooks implementation for tag-based mode Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 20/24] kasan, arm64: add brk handler for inline instrumentation Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 21/24] kasan, mm, arm64: tag non slab memory allocated via pagealloc Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 22/24] kasan: add __must_check annotations to kasan hooks Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 23/24] kasan: update documentation Andrey Konovalov
2018-11-19 17:26 ` [PATCH v11 24/24] kasan: add SPDX-License-Identifier mark to source files Andrey Konovalov
2018-11-19 17:28 ` [PATCH v11 00/24] kasan: add software tag-based mode for arm64 Andrey Konovalov
2018-11-19 17:32 ` Mark Rutland
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=14a68774683e15692615600c47bba53506a1c8ef.1542648335.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Jacob.Bramley@arm.com \
--cc=Lee.Smith@arm.com \
--cc=Ramana.Radhakrishnan@arm.com \
--cc=Ruben.Ayrapetyan@arm.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=cpandya@codeaurora.org \
--cc=dave.martin@arm.com \
--cc=dvyukov@google.com \
--cc=ebiederm@xmission.com \
--cc=eugenis@google.com \
--cc=geert@linux-m68k.org \
--cc=glider@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=kcc@google.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kstewart@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-sparse@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=markbrand@google.com \
--cc=mingo@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paullawrence@google.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=vishwath@google.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).