linux-kernel - [PATCH 12/18] vchecker: fix 'remove' handling on callstack checker

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 28 Nov 2017 16:48:47 +0900
From:   js1304@...il.com
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Andrey Ryabinin <aryabinin@...tuozzo.com>,
        Alexander Potapenko <glider@...gle.com>,
        Dmitry Vyukov <dvyukov@...gle.com>, kasan-dev@...glegroups.com,
        linux-mm@...ck.org, linux-kernel@...r.kernel.org,
        Namhyung Kim <namhyung@...nel.org>,
        Wengang Wang <wen.gang.wang@...cle.com>,
        Joonsoo Kim <iamjoonsoo.kim@....com>
Subject: [PATCH 12/18] vchecker: fix 'remove' handling on callstack checker

From: Joonsoo Kim <iamjoonsoo.kim@....com>

Since stack depot library doesn't support removal operation,
after removing and adding again callstack cb, callstack checker cannot
correctly judge whether this callstack is new or not for current cb
if the same callstack happens for previous cb.

This problem can be fixed by per-user stack depot since
we can create/destroy it when callstack cb is created/destroyed.
With that, is_new always shows correct result for current cb.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@....com>
---
 mm/kasan/vchecker.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/mm/kasan/vchecker.c b/mm/kasan/vchecker.c
index dc3a9a7..acead62 100644
--- a/mm/kasan/vchecker.c
+++ b/mm/kasan/vchecker.c
@@ -68,6 +68,7 @@ struct vchecker_value_arg {
 
 #define CALLSTACK_MAX_HANDLE  (PAGE_SIZE / sizeof(depot_stack_handle_t))
 struct vchecker_callstack_arg {
+	struct stackdepot *s;
 	depot_stack_handle_t *handles;
 	atomic_t count;
 	bool enabled;
@@ -307,8 +308,8 @@ static void filter_vchecker_stacks(struct stack_trace *trace,
 	}
 }
 
-static noinline depot_stack_handle_t save_stack(unsigned long ret_ip,
-						bool *is_new)
+static noinline depot_stack_handle_t save_stack(struct stackdepot *s,
+				unsigned long ret_ip, bool *is_new)
 {
 	unsigned long entries[VCHECKER_STACK_DEPTH];
 	struct stack_trace trace = {
@@ -328,7 +329,7 @@ static noinline depot_stack_handle_t save_stack(unsigned long ret_ip,
 		return 0;
 
 	filter_vchecker_stacks(&trace, ret_ip);
-	handle = depot_save_stack(NULL, &trace, __GFP_ATOMIC, is_new);
+	handle = depot_save_stack(s, &trace, __GFP_ATOMIC, is_new);
 	WARN_ON(!handle);
 
 	return handle;
@@ -570,7 +571,7 @@ static bool check_value(struct kmem_cache *s, struct vchecker_cb *cb,
 	if (!write)
 		goto check;
 
-	handle = save_stack(ret_ip, NULL);
+	handle = save_stack(NULL, ret_ip, NULL);
 	if (!handle) {
 		pr_err("VCHECKER: %s: fail at addr %p\n", __func__, object);
 		dump_stack();
@@ -637,6 +638,14 @@ static int init_callstack(struct kmem_cache *s, struct vchecker_cb *cb,
 		kfree(arg);
 		return -ENOMEM;
 	}
+
+	arg->s = create_stackdepot();
+	if (!arg->s) {
+		free_page((unsigned long)arg->handles);
+		kfree(arg);
+		return -ENOMEM;
+	}
+
 	atomic_set(&arg->count, 0);
 
 	cb->begin = begin;
@@ -650,6 +659,7 @@ static void fini_callstack(struct vchecker_cb *cb)
 {
 	struct vchecker_callstack_arg *arg = cb->arg;
 
+	destroy_stackdepot(arg->s);
 	free_page((unsigned long)arg->handles);
 	kfree(arg);
 }
@@ -662,7 +672,7 @@ static void show_callstack_handle(struct seq_file *f, int idx,
 
 	seq_printf(f, "callstack #%d\n", idx);
 
-	depot_fetch_stack(NULL, arg->handles[idx], &trace);
+	depot_fetch_stack(arg->s, arg->handles[idx], &trace);
 
 	for (i = 0; i < trace.nr_entries; i++)
 		seq_printf(f, "  %pS\n", (void *)trace.entries[i]);
@@ -705,7 +715,7 @@ static bool check_callstack(struct kmem_cache *s, struct vchecker_cb *cb,
 	struct vchecker_callstack_arg *arg = cb->arg;
 	int idx;
 
-	handle = save_stack(ret_ip, &is_new);
+	handle = save_stack(arg->s, ret_ip, &is_new);
 	if (!is_new)
 		return true;
 
-- 
2.7.4