[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200929183513.380760-5-alex.popov@linux.com>
Date: Tue, 29 Sep 2020 21:35:11 +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 4/6] mm: Implement slab quarantine randomization
The randomization is very important for the slab quarantine security
properties. Without it the number of kmalloc()+kfree() calls that are
needed for overwriting the vulnerable object is almost the same.
That would be good for stable use-after-free exploitation, and we
should not allow that.
This commit contains very compact and hackish changes that introduce
the quarantine randomization. At first all quarantine batches are filled
by objects. Then during the quarantine reducing we randomly choose and
free 1/2 of objects from a randomly chosen batch. Now the randomized
quarantine releases the freed object at an unpredictable moment, which
is harmful for the heap spraying technique employed by use-after-free
exploits.
Signed-off-by: Alexander Popov <alex.popov@...ux.com>
---
mm/kasan/quarantine.c | 79 +++++++++++++++++++++++++++++++++++++------
1 file changed, 69 insertions(+), 10 deletions(-)
diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
index 61666263c53e..4ce100605086 100644
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@ -29,6 +29,7 @@
#include <linux/srcu.h>
#include <linux/string.h>
#include <linux/types.h>
+#include <linux/random.h>
#include "../slab.h"
#include "kasan.h"
@@ -89,8 +90,13 @@ static void qlist_move_all(struct qlist_head *from, struct qlist_head *to)
}
#define QUARANTINE_PERCPU_SIZE (1 << 20)
+
+#ifdef CONFIG_KASAN
#define QUARANTINE_BATCHES \
(1024 > 4 * CONFIG_NR_CPUS ? 1024 : 4 * CONFIG_NR_CPUS)
+#else
+#define QUARANTINE_BATCHES 128
+#endif
/*
* The object quarantine consists of per-cpu queues and a global queue,
@@ -110,10 +116,7 @@ DEFINE_STATIC_SRCU(remove_cache_srcu);
/* Maximum size of the global queue. */
static unsigned long quarantine_max_size;
-/*
- * Target size of a batch in global_quarantine.
- * Usually equal to QUARANTINE_PERCPU_SIZE unless we have too much RAM.
- */
+/* Target size of a batch in global_quarantine. */
static unsigned long quarantine_batch_size;
/*
@@ -191,7 +194,12 @@ void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache)
q = this_cpu_ptr(&cpu_quarantine);
qlist_put(q, &info->quarantine_link, cache->size);
+#ifdef CONFIG_KASAN
if (unlikely(q->bytes > QUARANTINE_PERCPU_SIZE)) {
+#else
+ if (unlikely(q->bytes > min_t(size_t, QUARANTINE_PERCPU_SIZE,
+ READ_ONCE(quarantine_batch_size)))) {
+#endif
qlist_move_all(q, &temp);
raw_spin_lock(&quarantine_lock);
@@ -204,7 +212,7 @@ void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache)
new_tail = quarantine_tail + 1;
if (new_tail == QUARANTINE_BATCHES)
new_tail = 0;
- if (new_tail != quarantine_head)
+ if (new_tail != quarantine_head || !IS_ENABLED(CONFIG_KASAN))
quarantine_tail = new_tail;
}
raw_spin_unlock(&quarantine_lock);
@@ -213,12 +221,43 @@ void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache)
local_irq_restore(flags);
}
+static void qlist_move_random(struct qlist_head *from, struct qlist_head *to)
+{
+ struct qlist_node *curr;
+
+ if (unlikely(qlist_empty(from)))
+ return;
+
+ curr = from->head;
+ qlist_init(from);
+ while (curr) {
+ struct qlist_node *next = curr->next;
+ struct kmem_cache *obj_cache = qlink_to_cache(curr);
+ int rnd = get_random_int();
+
+ /*
+ * Hackish quarantine randomization, part 2:
+ * move only 1/2 of objects to the destination list.
+ * TODO: use random bits sparingly for better performance.
+ */
+ if (rnd % 2 == 0)
+ qlist_put(to, curr, obj_cache->size);
+ else
+ qlist_put(from, curr, obj_cache->size);
+
+ curr = next;
+ }
+}
+
void quarantine_reduce(void)
{
- size_t total_size, new_quarantine_size, percpu_quarantines;
+ size_t total_size;
unsigned long flags;
int srcu_idx;
struct qlist_head to_free = QLIST_INIT;
+#ifdef CONFIG_KASAN
+ size_t new_quarantine_size, percpu_quarantines;
+#endif
if (likely(READ_ONCE(quarantine_size) <=
READ_ONCE(quarantine_max_size)))
@@ -236,12 +275,12 @@ void quarantine_reduce(void)
srcu_idx = srcu_read_lock(&remove_cache_srcu);
raw_spin_lock_irqsave(&quarantine_lock, flags);
- /*
- * Update quarantine size in case of hotplug. Allocate a fraction of
- * the installed memory to quarantine minus per-cpu queue limits.
- */
+ /* Update quarantine size in case of hotplug */
total_size = (totalram_pages() << PAGE_SHIFT) /
QUARANTINE_FRACTION;
+
+#ifdef CONFIG_KASAN
+ /* Subtract per-cpu queue limits from total quarantine size */
percpu_quarantines = QUARANTINE_PERCPU_SIZE * num_online_cpus();
new_quarantine_size = (total_size < percpu_quarantines) ?
0 : total_size - percpu_quarantines;
@@ -257,6 +296,26 @@ void quarantine_reduce(void)
if (quarantine_head == QUARANTINE_BATCHES)
quarantine_head = 0;
}
+#else /* CONFIG_KASAN */
+ /*
+ * Don't subtract per-cpu queue limits from total quarantine
+ * size to consume all quarantine slots.
+ */
+ WRITE_ONCE(quarantine_max_size, total_size);
+ WRITE_ONCE(quarantine_batch_size, total_size / QUARANTINE_BATCHES);
+
+ /*
+ * Hackish quarantine randomization, part 1:
+ * pick a random batch for reducing.
+ */
+ if (likely(quarantine_size > quarantine_max_size)) {
+ do {
+ quarantine_head = get_random_int() % QUARANTINE_BATCHES;
+ } while (quarantine_head == quarantine_tail);
+ qlist_move_random(&global_quarantine[quarantine_head], &to_free);
+ WRITE_ONCE(quarantine_size, quarantine_size - to_free.bytes);
+ }
+#endif
raw_spin_unlock_irqrestore(&quarantine_lock, flags);
--
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.
