From: Andrey Konovalov <andreyknvl@google.com>
To: Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>, Theodore Ts'o <tytso@mit.edu>,
Jan Kara <jack@suse.com>, Christopher Li <sparse@chrisli.org>,
Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Yury Norov <ynorov@caviumnetworks.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Bob Picco <bob.picco@oracle.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Punit Agrawal <punit.agrawal@arm.com>,
Dave Martin <Dave.Martin@arm.com>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry@arm.com>,
Michael Weiser <michael.weiser@gmx.de>,
Steve Capper <steve.capper@arm.com>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Sandipan Das <sandipan@linux.vnet.ibm.com>,
Paul Lawrence <paullawrence@google.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Kees Cook <keescook@chromium.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Arnd Bergmann <arnd@arndb.de>,
kasan-dev@googlegroups.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-ext4@vger.kernel.org,
linux-sparse@vger.kernel.org, linux-mm@kvack.org,
linux-kbuild@vger.kernel.org, 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>,
Kees Cook <keescook@google.com>, Jann Horn <jannh@google.com>,
Mark Brand <markbrand@google.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Subject: [RFC PATCH 09/14] khwasan: add hooks implementation
Date: Fri, 2 Mar 2018 20:44:28 +0100 [thread overview]
Message-ID: <06a4d0c483fba8babd01fe23727fe4a79482d309.1520017438.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1520017438.git.andreyknvl@google.com>
In-Reply-To: <cover.1520017438.git.andreyknvl@google.com>
This commit adds KHWASAN hooks implementation.
1. When a new slab cache is created, KHWASAN rounds up the size of the
objects in this cache to KASAN_SHADOW_SCALE_SIZE (== 16).
2. On each kmalloc KHWASAN generates a random tag, sets the shadow memory,
that corresponds to this object to this tag, and embeds this tag value
into the top byte of the returned pointer.
3. On each kfree KHWASAN poisons the shadow memory with a random tag to
allow detection of use-after-free bugs.
The rest of the logic of the hook implementation is very much similar to
the one provided by KASAN. KHWASAN saves allocation and free stack metadata
to the slab object the same was KASAN does this.
---
mm/kasan/khwasan.c | 178 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 175 insertions(+), 3 deletions(-)
diff --git a/mm/kasan/khwasan.c b/mm/kasan/khwasan.c
index 21a2221e3368..09d6f0a72266 100644
--- a/mm/kasan/khwasan.c
+++ b/mm/kasan/khwasan.c
@@ -78,69 +78,238 @@ void *khwasan_reset_tag(void *addr)
return reset_tag(addr);
}
+void kasan_poison_shadow(const void *address, size_t size, u8 value)
+{
+ void *shadow_start, *shadow_end;
+
+ /* Perform shadow offset calculation based on untagged address */
+ address = reset_tag((void *)address);
+
+ shadow_start = kasan_mem_to_shadow(address);
+ shadow_end = kasan_mem_to_shadow(address + size);
+
+ memset(shadow_start, value, shadow_end - shadow_start);
+}
+
void kasan_unpoison_shadow(const void *address, size_t size)
{
+ /* KHWASAN only allows 16-byte granularity */
+ size = round_up(size, KASAN_SHADOW_SCALE_SIZE);
+ kasan_poison_shadow(address, size, get_tag(address));
}
void check_memory_region(unsigned long addr, size_t size, bool write,
unsigned long ret_ip)
{
+ u8 tag;
+ u8 *shadow_first, *shadow_last, *shadow;
+ void *untagged_addr;
+
+ tag = get_tag((void *)addr);
+ untagged_addr = reset_tag((void *)addr);
+ shadow_first = (u8 *)kasan_mem_to_shadow(untagged_addr);
+ shadow_last = (u8 *)kasan_mem_to_shadow(untagged_addr + size - 1);
+
+ for (shadow = shadow_first; shadow <= shadow_last; shadow++) {
+ if (*shadow != tag) {
+ /* Report invalid-access bug here */
+ return;
+ }
+ }
}
void kasan_free_pages(struct page *page, unsigned int order)
{
+ if (likely(!PageHighMem(page)))
+ kasan_poison_shadow(page_address(page),
+ PAGE_SIZE << order,
+ khwasan_random_tag());
}
void kasan_cache_create(struct kmem_cache *cache, size_t *size,
slab_flags_t *flags)
{
+ int orig_size = *size;
+
+ cache->kasan_info.alloc_meta_offset = *size;
+ *size += sizeof(struct kasan_alloc_meta);
+
+ if (*size % KASAN_SHADOW_SCALE_SIZE != 0)
+ *size = round_up(*size, KASAN_SHADOW_SCALE_SIZE);
+
+
+ if (*size > KMALLOC_MAX_SIZE) {
+ *size = orig_size;
+ return;
+ }
+
+ cache->align = round_up(cache->align, KASAN_SHADOW_SCALE_SIZE);
+
+ *flags |= SLAB_KASAN;
}
void kasan_poison_slab(struct page *page)
{
+ kasan_poison_shadow(page_address(page),
+ PAGE_SIZE << compound_order(page),
+ khwasan_random_tag());
}
void kasan_poison_object_data(struct kmem_cache *cache, void *object)
{
+ kasan_poison_shadow(object,
+ round_up(cache->object_size, KASAN_SHADOW_SCALE_SIZE),
+ khwasan_random_tag());
}
void *kasan_slab_alloc(struct kmem_cache *cache, void *object, gfp_t flags)
{
+ if (!READ_ONCE(khwasan_enabled))
+ return object;
+ object = kasan_kmalloc(cache, object, cache->object_size, flags);
+ if (unlikely(cache->ctor)) {
+ // Cache constructor might use object's pointer value to
+ // initialize some of its fields.
+ cache->ctor(object);
+ }
return object;
}
-bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip)
+static bool __kasan_slab_free(struct kmem_cache *cache, void *object,
+ unsigned long ip)
{
+ u8 shadow_byte;
+ u8 tag;
+ unsigned long rounded_up_size;
+ void *untagged_addr = reset_tag(object);
+
+ if (unlikely(nearest_obj(cache, virt_to_head_page(untagged_addr),
+ untagged_addr) != untagged_addr)) {
+ /* Report invalid-free here */
+ return true;
+ }
+
+ /* RCU slabs could be legally used after free within the RCU period */
+ if (unlikely(cache->flags & SLAB_TYPESAFE_BY_RCU))
+ return false;
+
+ shadow_byte = READ_ONCE(*(u8 *)kasan_mem_to_shadow(untagged_addr));
+ tag = get_tag(object);
+ if (tag != shadow_byte) {
+ /* Report invalid-free here */
+ return true;
+ }
+
+ rounded_up_size = round_up(cache->object_size, KASAN_SHADOW_SCALE_SIZE);
+ kasan_poison_shadow(object, rounded_up_size, khwasan_random_tag());
+
+ if (unlikely(!(cache->flags & SLAB_KASAN)))
+ return false;
+
+ set_track(&get_alloc_info(cache, object)->free_track, GFP_NOWAIT);
return false;
}
+bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip)
+{
+ return __kasan_slab_free(cache, object, ip);
+}
+
void *kasan_kmalloc(struct kmem_cache *cache, const void *object,
size_t size, gfp_t flags)
{
- return (void *)object;
+ unsigned long redzone_start, redzone_end;
+ u8 tag;
+
+ if (!READ_ONCE(khwasan_enabled))
+ return (void *)object;
+
+ if (unlikely(object == NULL))
+ return NULL;
+
+ redzone_start = round_up((unsigned long)(object + size),
+ KASAN_SHADOW_SCALE_SIZE);
+ redzone_end = round_up((unsigned long)(object + cache->object_size),
+ KASAN_SHADOW_SCALE_SIZE);
+
+ tag = khwasan_random_tag();
+ kasan_poison_shadow(object, redzone_start - (unsigned long)object, tag);
+ kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
+ khwasan_random_tag());
+
+ if (cache->flags & SLAB_KASAN)
+ set_track(&get_alloc_info(cache, object)->alloc_track, flags);
+
+ return set_tag((void *)object, tag);
}
EXPORT_SYMBOL(kasan_kmalloc);
void *kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags)
{
- return (void *)ptr;
+ unsigned long redzone_start, redzone_end;
+ u8 tag;
+ struct page *page;
+
+ if (!READ_ONCE(khwasan_enabled))
+ return (void *)ptr;
+
+ if (unlikely(ptr == NULL))
+ return NULL;
+
+ page = virt_to_page(ptr);
+ redzone_start = round_up((unsigned long)(ptr + size),
+ KASAN_SHADOW_SCALE_SIZE);
+ redzone_end = (unsigned long)ptr + (PAGE_SIZE << compound_order(page));
+
+ tag = khwasan_random_tag();
+ kasan_poison_shadow(ptr, redzone_start - (unsigned long)ptr, tag);
+ kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
+ khwasan_random_tag());
+
+ return set_tag((void *)ptr, tag);
}
void kasan_poison_kfree(void *ptr, unsigned long ip)
{
+ struct page *page;
+
+ page = virt_to_head_page(ptr);
+
+ if (unlikely(!PageSlab(page))) {
+ if (reset_tag(ptr) != page_address(page)) {
+ /* Report invalid-free here */
+ return;
+ }
+ kasan_poison_shadow(ptr, PAGE_SIZE << compound_order(page),
+ khwasan_random_tag());
+ } else {
+ __kasan_slab_free(page->slab_cache, ptr, ip);
+ }
}
void kasan_kfree_large(void *ptr, unsigned long ip)
{
+ struct page *page = virt_to_page(ptr);
+ struct page *head_page = virt_to_head_page(ptr);
+
+ if (reset_tag(ptr) != page_address(head_page)) {
+ /* Report invalid-free here */
+ return;
+ }
+
+ kasan_poison_shadow(ptr, PAGE_SIZE << compound_order(page),
+ khwasan_random_tag());
}
#define DEFINE_HWASAN_LOAD_STORE(size) \
void __hwasan_load##size##_noabort(unsigned long addr) \
{ \
+ check_memory_region(addr, size, false, _RET_IP_); \
} \
EXPORT_SYMBOL(__hwasan_load##size##_noabort); \
void __hwasan_store##size##_noabort(unsigned long addr) \
{ \
+ check_memory_region(addr, size, true, _RET_IP_); \
} \
EXPORT_SYMBOL(__hwasan_store##size##_noabort)
@@ -152,15 +321,18 @@ DEFINE_HWASAN_LOAD_STORE(16);
void __hwasan_loadN_noabort(unsigned long addr, unsigned long size)
{
+ check_memory_region(addr, size, false, _RET_IP_);
}
EXPORT_SYMBOL(__hwasan_loadN_noabort);
void __hwasan_storeN_noabort(unsigned long addr, unsigned long size)
{
+ check_memory_region(addr, size, true, _RET_IP_);
}
EXPORT_SYMBOL(__hwasan_storeN_noabort);
void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size)
{
+ kasan_poison_shadow((void *)addr, size, tag);
}
EXPORT_SYMBOL(__hwasan_tag_memory);
--
2.16.2.395.g2e18187dfd-goog
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2018-03-02 19:45 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 19:44 [RFC PATCH 00/14] khwasan: kernel hardware assisted address sanitizer Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 01/14] khwasan: change kasan hooks signatures Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 02/14] khwasan: move common kasan and khwasan code to common.c Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 03/14] khwasan: add CONFIG_KASAN_CLASSIC and CONFIG_KASAN_TAGS Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 04/14] khwasan: adjust shadow size for CONFIG_KASAN_TAGS Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 05/14] khwasan: initialize shadow to 0xff Andrey Konovalov
2018-03-02 21:55 ` Evgenii Stepanov
2018-03-02 19:44 ` [RFC PATCH 06/14] khwasan: enable top byte ignore for the kernel Andrey Konovalov
2018-03-05 14:29 ` Mark Rutland
2018-03-09 18:15 ` Andrey Konovalov
2018-03-05 14:36 ` Mark Rutland
2018-03-06 14:24 ` Marc Zyngier
2018-03-09 18:21 ` Andrey Konovalov
2018-03-09 18:32 ` Marc Zyngier
2018-03-09 18:42 ` Andrey Konovalov
2018-03-09 19:06 ` Marc Zyngier
2018-03-09 19:16 ` Mark Rutland
2018-03-09 19:14 ` Mark Rutland
2018-03-09 18:17 ` Andrey Konovalov
2018-03-09 18:59 ` Mark Rutland
2018-03-02 19:44 ` [RFC PATCH 07/14] khwasan: add tag related helper functions Andrey Konovalov
2018-03-05 14:32 ` Mark Rutland
2018-03-06 18:31 ` Andrey Konovalov
2018-03-07 18:16 ` Christopher Lameter
2018-03-08 9:09 ` Dmitry Vyukov
2018-03-08 11:20 ` Mark Rutland
2018-03-02 19:44 ` [RFC PATCH 08/14] khwasan: perform untagged pointers comparison in krealloc Andrey Konovalov
2018-03-05 14:39 ` Mark Rutland
2018-03-06 18:33 ` Andrey Konovalov
2018-03-02 19:44 ` Andrey Konovalov [this message]
2018-03-05 14:44 ` [RFC PATCH 09/14] khwasan: add hooks implementation Mark Rutland
2018-03-06 18:38 ` Andrey Konovalov
2018-03-08 11:25 ` Mark Rutland
2018-03-09 18:10 ` Andrey Konovalov
2018-03-13 15:05 ` Alexander Potapenko
2018-03-13 17:00 ` Andrey Konovalov
2018-03-15 16:52 ` Andrey Ryabinin
2018-03-16 18:09 ` Andrey Konovalov
2018-03-16 18:16 ` Evgenii Stepanov
2018-03-16 18:24 ` Andrey Konovalov
2018-03-16 18:45 ` Evgenii Stepanov
2018-03-16 19:06 ` Andrey Konovalov
2018-03-16 20:21 ` Evgenii Stepanov
2018-03-20 0:44 ` Anthony Yznaga
2018-03-20 13:43 ` Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 10/14] khwasan: add bug reporting routines Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 11/14] khwasan: add brk handler for inline instrumentation Andrey Konovalov
2018-03-05 14:51 ` Mark Rutland
2018-03-23 15:59 ` Andrey Konovalov
2018-03-24 3:42 ` Ard Biesheuvel
2018-03-26 9:36 ` Mark Rutland
2018-03-27 13:03 ` Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 12/14] khwasan, jbd2: add khwasan annotations Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 13/14] khwasan: update kasan documentation Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 14/14] khwasan: default the instrumentation mode to inline Andrey Konovalov
2018-03-05 14:54 ` Mark Rutland
2018-03-09 18:06 ` Andrey Konovalov
2018-03-09 19:18 ` Mark Rutland
2018-03-12 13:10 ` Andrey Konovalov
2018-03-13 14:44 ` Alexander Potapenko
2018-03-13 16:49 ` Andrey Konovalov
2018-03-04 9:16 ` [RFC PATCH 00/14] khwasan: kernel hardware assisted address sanitizer Geert Uytterhoeven
2018-03-04 11:44 ` Ingo Molnar
2018-03-04 15:49 ` Geert Uytterhoeven
2018-03-06 18:21 ` 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=06a4d0c483fba8babd01fe23727fe4a79482d309.1520017438.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Dave.Martin@arm.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=bob.picco@oracle.com \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=dvyukov@google.com \
--cc=dwmw@amazon.co.uk \
--cc=eugenis@google.com \
--cc=geert@linux-m68k.org \
--cc=glider@google.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=jack@suse.com \
--cc=james.morse@arm.com \
--cc=jannh@google.com \
--cc=jpoimboe@redhat.com \
--cc=julien.thierry@arm.com \
--cc=kasan-dev@googlegroups.com \
--cc=kcc@google.com \
--cc=keescook@chromium.org \
--cc=keescook@google.com \
--cc=kristina.martsenko@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@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=michael.weiser@gmx.de \
--cc=michal.lkml@markovi.net \
--cc=mingo@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paullawrence@google.com \
--cc=penberg@kernel.org \
--cc=punit.agrawal@arm.com \
--cc=rientjes@google.com \
--cc=sandipan@linux.vnet.ibm.com \
--cc=sparse@chrisli.org \
--cc=steve.capper@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=tytso@mit.edu \
--cc=will.deacon@arm.com \
--cc=yamada.masahiro@socionext.com \
--cc=ynorov@caviumnetworks.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