[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200929183513.380760-6-alex.popov@linux.com>
Date: Tue, 29 Sep 2020 21:35:12 +0300
From: Alexander Popov <alex.popov@...ux.com>
To: Kees Cook <keescook@...omium.org>,
Jann Horn <jannh@...gle.com>,
Will Deacon <will@...nel.org>,
Andrey Ryabinin <aryabinin@...tuozzo.com>,
Alexander Potapenko <glider@...gle.com>,
Dmitry Vyukov <dvyukov@...gle.com>,
Christoph Lameter <cl@...ux.com>,
Pekka Enberg <penberg@...nel.org>,
David Rientjes <rientjes@...gle.com>,
Joonsoo Kim <iamjoonsoo.kim@....com>,
Andrew Morton <akpm@...ux-foundation.org>,
Masahiro Yamada <masahiroy@...nel.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
Steven Rostedt <rostedt@...dmis.org>,
Peter Zijlstra <peterz@...radead.org>,
Krzysztof Kozlowski <krzk@...nel.org>,
Patrick Bellasi <patrick.bellasi@....com>,
David Howells <dhowells@...hat.com>,
Eric Biederman <ebiederm@...ssion.com>,
Johannes Weiner <hannes@...xchg.org>,
Laura Abbott <labbott@...hat.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Daniel Micay <danielmicay@...il.com>,
Andrey Konovalov <andreyknvl@...gle.com>,
Matthew Wilcox <willy@...radead.org>,
Pavel Machek <pavel@...x.de>,
Valentin Schneider <valentin.schneider@....com>,
kasan-dev@...glegroups.com,
linux-mm@...ck.org,
kernel-hardening@...ts.openwall.com,
linux-kernel@...r.kernel.org,
Alexander Popov <alex.popov@...ux.com>
Cc: notify@...nel.org
Subject: [PATCH RFC v2 5/6] lkdtm: Add heap quarantine tests
Add tests for CONFIG_SLAB_QUARANTINE.
The HEAP_SPRAY test aims to reallocate a recently freed heap object.
It allocates and frees an object from a separate kmem_cache and then
allocates 400000 similar objects from it. I.e. this test performs an
original heap spraying technique for use-after-free exploitation.
If CONFIG_SLAB_QUARANTINE is disabled, the freed object is instantly
reallocated and overwritten, which is required for a successful attack.
The PUSH_THROUGH_QUARANTINE test allocates and frees an object from a
separate kmem_cache and then performs kmem_cache_alloc()+kmem_cache_free()
400000 times. This test pushes the object through the heap quarantine and
reallocates it after it returns back to the allocator freelist.
If CONFIG_SLAB_QUARANTINE is enabled, this test should show that the
randomized quarantine will release the freed object at an unpredictable
moment, which makes use-after-free exploitation much harder.
Signed-off-by: Alexander Popov <alex.popov@...ux.com>
---
drivers/misc/lkdtm/core.c | 2 +
drivers/misc/lkdtm/heap.c | 110 +++++++++++++++++++++++++++++++++++++
drivers/misc/lkdtm/lkdtm.h | 2 +
3 files changed, 114 insertions(+)
diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c
index a5e344df9166..6be5ca49ae6b 100644
--- a/drivers/misc/lkdtm/core.c
+++ b/drivers/misc/lkdtm/core.c
@@ -126,6 +126,8 @@ static const struct crashtype crashtypes[] = {
CRASHTYPE(SLAB_FREE_DOUBLE),
CRASHTYPE(SLAB_FREE_CROSS),
CRASHTYPE(SLAB_FREE_PAGE),
+ CRASHTYPE(HEAP_SPRAY),
+ CRASHTYPE(PUSH_THROUGH_QUARANTINE),
CRASHTYPE(SOFTLOCKUP),
CRASHTYPE(HARDLOCKUP),
CRASHTYPE(SPINLOCKUP),
diff --git a/drivers/misc/lkdtm/heap.c b/drivers/misc/lkdtm/heap.c
index 1323bc16f113..f666a08d9462 100644
--- a/drivers/misc/lkdtm/heap.c
+++ b/drivers/misc/lkdtm/heap.c
@@ -10,6 +10,7 @@
static struct kmem_cache *double_free_cache;
static struct kmem_cache *a_cache;
static struct kmem_cache *b_cache;
+static struct kmem_cache *spray_cache;
/*
* This tries to stay within the next largest power-of-2 kmalloc cache
@@ -204,6 +205,112 @@ static void ctor_a(void *region)
{ }
static void ctor_b(void *region)
{ }
+static void ctor_spray(void *region)
+{ }
+
+#define SPRAY_LENGTH 400000
+#define SPRAY_ITEM_SIZE 333
+
+void lkdtm_HEAP_SPRAY(void)
+{
+ int *addr;
+ int **spray_addrs = NULL;
+ unsigned long i = 0;
+
+ addr = kmem_cache_alloc(spray_cache, GFP_KERNEL);
+ if (!addr) {
+ pr_info("Can't allocate memory in spray_cache cache\n");
+ return;
+ }
+
+ memset(addr, 0xA5, SPRAY_ITEM_SIZE);
+ kmem_cache_free(spray_cache, addr);
+ pr_info("Allocated and freed spray_cache object %p of size %d\n",
+ addr, SPRAY_ITEM_SIZE);
+
+ spray_addrs = kcalloc(SPRAY_LENGTH, sizeof(int *), GFP_KERNEL);
+ if (!spray_addrs) {
+ pr_info("Unable to allocate memory for spray_addrs\n");
+ return;
+ }
+
+ pr_info("Original heap spraying: allocate %d objects of size %d...\n",
+ SPRAY_LENGTH, SPRAY_ITEM_SIZE);
+ for (i = 0; i < SPRAY_LENGTH; i++) {
+ spray_addrs[i] = kmem_cache_alloc(spray_cache, GFP_KERNEL);
+ if (!spray_addrs[i]) {
+ pr_info("Can't allocate memory in spray_cache cache\n");
+ break;
+ }
+
+ memset(spray_addrs[i], 0x42, SPRAY_ITEM_SIZE);
+
+ if (spray_addrs[i] == addr) {
+ pr_info("FAIL: attempt %lu: freed object is reallocated\n", i);
+ break;
+ }
+ }
+
+ if (i == SPRAY_LENGTH)
+ pr_info("OK: original heap spraying hasn't succeed\n");
+
+ for (i = 0; i < SPRAY_LENGTH; i++) {
+ if (spray_addrs[i])
+ kmem_cache_free(spray_cache, spray_addrs[i]);
+ }
+
+ kfree(spray_addrs);
+}
+
+/*
+ * Pushing an object through the quarantine requires both allocating and
+ * freeing memory. Objects are released from the quarantine on new memory
+ * allocations, but only when the quarantine size is over the limit.
+ * And the quarantine size grows on new memory freeing.
+ *
+ * This test should show that the randomized quarantine will release the
+ * freed object at an unpredictable moment.
+ */
+void lkdtm_PUSH_THROUGH_QUARANTINE(void)
+{
+ int *addr;
+ int *push_addr;
+ unsigned long i;
+
+ addr = kmem_cache_alloc(spray_cache, GFP_KERNEL);
+ if (!addr) {
+ pr_info("Can't allocate memory in spray_cache cache\n");
+ return;
+ }
+
+ memset(addr, 0xA5, SPRAY_ITEM_SIZE);
+ kmem_cache_free(spray_cache, addr);
+ pr_info("Allocated and freed spray_cache object %p of size %d\n",
+ addr, SPRAY_ITEM_SIZE);
+
+ pr_info("Push through quarantine: allocate and free %d objects of size %d...\n",
+ SPRAY_LENGTH, SPRAY_ITEM_SIZE);
+ for (i = 0; i < SPRAY_LENGTH; i++) {
+ push_addr = kmem_cache_alloc(spray_cache, GFP_KERNEL);
+ if (!push_addr) {
+ pr_info("Can't allocate memory in spray_cache cache\n");
+ break;
+ }
+
+ memset(push_addr, 0x42, SPRAY_ITEM_SIZE);
+ kmem_cache_free(spray_cache, push_addr);
+
+ if (push_addr == addr) {
+ pr_info("Target object is reallocated at attempt %lu\n", i);
+ break;
+ }
+ }
+
+ if (i == SPRAY_LENGTH) {
+ pr_info("Target object is NOT reallocated in %d attempts\n",
+ SPRAY_LENGTH);
+ }
+}
void __init lkdtm_heap_init(void)
{
@@ -211,6 +318,8 @@ void __init lkdtm_heap_init(void)
64, 0, 0, ctor_double_free);
a_cache = kmem_cache_create("lkdtm-heap-a", 64, 0, 0, ctor_a);
b_cache = kmem_cache_create("lkdtm-heap-b", 64, 0, 0, ctor_b);
+ spray_cache = kmem_cache_create("lkdtm-heap-spray",
+ SPRAY_ITEM_SIZE, 0, 0, ctor_spray);
}
void __exit lkdtm_heap_exit(void)
@@ -218,4 +327,5 @@ void __exit lkdtm_heap_exit(void)
kmem_cache_destroy(double_free_cache);
kmem_cache_destroy(a_cache);
kmem_cache_destroy(b_cache);
+ kmem_cache_destroy(spray_cache);
}
diff --git a/drivers/misc/lkdtm/lkdtm.h b/drivers/misc/lkdtm/lkdtm.h
index 8878538b2c13..d6b4b0708359 100644
--- a/drivers/misc/lkdtm/lkdtm.h
+++ b/drivers/misc/lkdtm/lkdtm.h
@@ -45,6 +45,8 @@ void lkdtm_READ_BUDDY_AFTER_FREE(void);
void lkdtm_SLAB_FREE_DOUBLE(void);
void lkdtm_SLAB_FREE_CROSS(void);
void lkdtm_SLAB_FREE_PAGE(void);
+void lkdtm_HEAP_SPRAY(void);
+void lkdtm_PUSH_THROUGH_QUARANTINE(void);
/* lkdtm_perms.c */
void __init lkdtm_perms_init(void);
--
2.26.2
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
