From: js1304@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Dmitry Vyukov <dvyukov@google.com>, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>, Wengang Wang <wen.gang.wang@oracle.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com> Subject: [PATCH 11/18] vchecker: consistently exclude vchecker's stacktrace Date: Tue, 28 Nov 2017 16:48:46 +0900 [thread overview] Message-ID: <1511855333-3570-12-git-send-email-iamjoonsoo.kim@lge.com> (raw) In-Reply-To: <1511855333-3570-1-git-send-email-iamjoonsoo.kim@lge.com> From: Joonsoo Kim <iamjoonsoo.kim@lge.com> Since there is a different callpath even in the vchecker, static skip value doesn't always exclude vchecker's stacktrace. Fix it through checking stacktrace dynamically. v2: skip two depth of stack at default, it's safe! Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> --- mm/kasan/vchecker.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/mm/kasan/vchecker.c b/mm/kasan/vchecker.c index df480d5..dc3a9a7 100644 --- a/mm/kasan/vchecker.c +++ b/mm/kasan/vchecker.c @@ -23,6 +23,7 @@ #include "kasan.h" #define VCHECKER_STACK_DEPTH (16) +#define VCHECKER_SKIP_DEPTH (2) struct vchecker { bool enabled; @@ -48,7 +49,7 @@ struct vchecker_type { void (*show)(struct kmem_cache *s, struct seq_file *f, struct vchecker_cb *cb, void *object, bool verbose); bool (*check)(struct kmem_cache *s, struct vchecker_cb *cb, - void *object, bool write, + void *object, bool write, unsigned long ret_ip, unsigned long begin, unsigned long end); }; @@ -276,7 +277,7 @@ bool vchecker_check(unsigned long addr, size_t size, continue; checked = true; - if (cb->type->check(s, cb, object, write, begin, end)) + if (cb->type->check(s, cb, object, write, ret_ip, begin, end)) continue; vchecker_report(addr, size, write, ret_ip, s, cb, object); @@ -292,14 +293,29 @@ bool vchecker_check(unsigned long addr, size_t size, return vchecker_poisoned((void *)addr, size); } -static noinline depot_stack_handle_t save_stack(int skip, bool *is_new) +static void filter_vchecker_stacks(struct stack_trace *trace, + unsigned long ret_ip) +{ + int i; + + for (i = 0; i < trace->nr_entries; i++) { + if (trace->entries[i] == ret_ip) { + trace->entries = &trace->entries[i]; + trace->nr_entries -= i; + break; + } + } +} + +static noinline depot_stack_handle_t save_stack(unsigned long ret_ip, + bool *is_new) { unsigned long entries[VCHECKER_STACK_DEPTH]; struct stack_trace trace = { .nr_entries = 0, .entries = entries, .max_entries = VCHECKER_STACK_DEPTH, - .skip = skip, + .skip = VCHECKER_SKIP_DEPTH, }; depot_stack_handle_t handle; @@ -311,6 +327,7 @@ static noinline depot_stack_handle_t save_stack(int skip, bool *is_new) if (trace.nr_entries == 0) return 0; + filter_vchecker_stacks(&trace, ret_ip); handle = depot_save_stack(NULL, &trace, __GFP_ATOMIC, is_new); WARN_ON(!handle); @@ -542,7 +559,7 @@ static void show_value(struct kmem_cache *s, struct seq_file *f, } static bool check_value(struct kmem_cache *s, struct vchecker_cb *cb, - void *object, bool write, + void *object, bool write, unsigned long ret_ip, unsigned long begin, unsigned long end) { struct vchecker_value_arg *arg; @@ -553,7 +570,7 @@ static bool check_value(struct kmem_cache *s, struct vchecker_cb *cb, if (!write) goto check; - handle = save_stack(0, NULL); + handle = save_stack(ret_ip, NULL); if (!handle) { pr_err("VCHECKER: %s: fail at addr %p\n", __func__, object); dump_stack(); @@ -679,16 +696,8 @@ static void show_callstack(struct kmem_cache *s, struct seq_file *f, } } -/* - * number of stacks to skip (at least). - * - * __asan_loadX -> vchecker_check -> cb->check() -> save_stack - * -> save_stack_trace - */ -#define STACK_SKIP 5 - static bool check_callstack(struct kmem_cache *s, struct vchecker_cb *cb, - void *object, bool write, + void *object, bool write, unsigned long ret_ip, unsigned long begin, unsigned long end) { u32 handle; @@ -696,7 +705,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(STACK_SKIP, &is_new); + handle = save_stack(ret_ip, &is_new); if (!is_new) return true; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: js1304@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Dmitry Vyukov <dvyukov@google.com>, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>, Wengang Wang <wen.gang.wang@oracle.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com> Subject: [PATCH 11/18] vchecker: consistently exclude vchecker's stacktrace Date: Tue, 28 Nov 2017 16:48:46 +0900 [thread overview] Message-ID: <1511855333-3570-12-git-send-email-iamjoonsoo.kim@lge.com> (raw) In-Reply-To: <1511855333-3570-1-git-send-email-iamjoonsoo.kim@lge.com> From: Joonsoo Kim <iamjoonsoo.kim@lge.com> Since there is a different callpath even in the vchecker, static skip value doesn't always exclude vchecker's stacktrace. Fix it through checking stacktrace dynamically. v2: skip two depth of stack at default, it's safe! Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> --- mm/kasan/vchecker.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/mm/kasan/vchecker.c b/mm/kasan/vchecker.c index df480d5..dc3a9a7 100644 --- a/mm/kasan/vchecker.c +++ b/mm/kasan/vchecker.c @@ -23,6 +23,7 @@ #include "kasan.h" #define VCHECKER_STACK_DEPTH (16) +#define VCHECKER_SKIP_DEPTH (2) struct vchecker { bool enabled; @@ -48,7 +49,7 @@ struct vchecker_type { void (*show)(struct kmem_cache *s, struct seq_file *f, struct vchecker_cb *cb, void *object, bool verbose); bool (*check)(struct kmem_cache *s, struct vchecker_cb *cb, - void *object, bool write, + void *object, bool write, unsigned long ret_ip, unsigned long begin, unsigned long end); }; @@ -276,7 +277,7 @@ bool vchecker_check(unsigned long addr, size_t size, continue; checked = true; - if (cb->type->check(s, cb, object, write, begin, end)) + if (cb->type->check(s, cb, object, write, ret_ip, begin, end)) continue; vchecker_report(addr, size, write, ret_ip, s, cb, object); @@ -292,14 +293,29 @@ bool vchecker_check(unsigned long addr, size_t size, return vchecker_poisoned((void *)addr, size); } -static noinline depot_stack_handle_t save_stack(int skip, bool *is_new) +static void filter_vchecker_stacks(struct stack_trace *trace, + unsigned long ret_ip) +{ + int i; + + for (i = 0; i < trace->nr_entries; i++) { + if (trace->entries[i] == ret_ip) { + trace->entries = &trace->entries[i]; + trace->nr_entries -= i; + break; + } + } +} + +static noinline depot_stack_handle_t save_stack(unsigned long ret_ip, + bool *is_new) { unsigned long entries[VCHECKER_STACK_DEPTH]; struct stack_trace trace = { .nr_entries = 0, .entries = entries, .max_entries = VCHECKER_STACK_DEPTH, - .skip = skip, + .skip = VCHECKER_SKIP_DEPTH, }; depot_stack_handle_t handle; @@ -311,6 +327,7 @@ static noinline depot_stack_handle_t save_stack(int skip, bool *is_new) if (trace.nr_entries == 0) return 0; + filter_vchecker_stacks(&trace, ret_ip); handle = depot_save_stack(NULL, &trace, __GFP_ATOMIC, is_new); WARN_ON(!handle); @@ -542,7 +559,7 @@ static void show_value(struct kmem_cache *s, struct seq_file *f, } static bool check_value(struct kmem_cache *s, struct vchecker_cb *cb, - void *object, bool write, + void *object, bool write, unsigned long ret_ip, unsigned long begin, unsigned long end) { struct vchecker_value_arg *arg; @@ -553,7 +570,7 @@ static bool check_value(struct kmem_cache *s, struct vchecker_cb *cb, if (!write) goto check; - handle = save_stack(0, NULL); + handle = save_stack(ret_ip, NULL); if (!handle) { pr_err("VCHECKER: %s: fail at addr %p\n", __func__, object); dump_stack(); @@ -679,16 +696,8 @@ static void show_callstack(struct kmem_cache *s, struct seq_file *f, } } -/* - * number of stacks to skip (at least). - * - * __asan_loadX -> vchecker_check -> cb->check() -> save_stack - * -> save_stack_trace - */ -#define STACK_SKIP 5 - static bool check_callstack(struct kmem_cache *s, struct vchecker_cb *cb, - void *object, bool write, + void *object, bool write, unsigned long ret_ip, unsigned long begin, unsigned long end) { u32 handle; @@ -696,7 +705,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(STACK_SKIP, &is_new); + handle = save_stack(ret_ip, &is_new); if (!is_new) return true; -- 2.7.4 -- 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:[~2017-11-28 7:51 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-28 7:48 [PATCH 00/18] introduce a new tool, valid access checker js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 01/18] mm/kasan: make some kasan functions global js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 02/18] vchecker: introduce the valid access checker js1304 2017-11-28 7:48 ` js1304 2017-11-28 19:41 ` Andi Kleen 2017-11-28 19:41 ` Andi Kleen 2017-11-29 5:36 ` Joonsoo Kim 2017-11-29 5:36 ` Joonsoo Kim 2017-12-01 5:08 ` kbuild test robot 2017-12-01 8:01 ` Joonsoo Kim 2017-12-01 8:01 ` Joonsoo Kim 2017-11-28 7:48 ` [PATCH 03/18] vchecker: mark/unmark the shadow of the allocated objects js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 04/18] vchecker: prepare per object memory for vchecker js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 05/18] vchecker: store/report callstack of value writer js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 06/18] lib/stackdepot: Add is_new arg to depot_save_stack js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 07/18] lib/stackdepot: extend stackdepot API to support per-user stackdepot js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 08/18] vchecker: Add 'callstack' checker js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 09/18] vchecker: Support toggle on/off of callstack check js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 10/18] vchecker: Use __GFP_ATOMIC to save stacktrace js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` js1304 [this message] 2017-11-28 7:48 ` [PATCH 11/18] vchecker: consistently exclude vchecker's stacktrace js1304 2017-11-28 7:48 ` [PATCH 12/18] vchecker: fix 'remove' handling on callstack checker js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 13/18] mm/vchecker: support inline KASAN build js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 14/18] mm/vchecker: make callstack depth configurable js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 15/18] mm/vchecker: pass allocation caller address to vchecker hook js1304 2017-11-28 7:48 ` js1304 2017-12-01 2:39 ` kbuild test robot 2017-12-01 3:01 ` kbuild test robot 2017-11-28 7:48 ` [PATCH 16/18] mm/vchecker: support allocation caller filter js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 17/18] lib/vchecker_test: introduce a sample for vchecker test js1304 2017-11-28 7:48 ` js1304 2017-11-28 7:48 ` [PATCH 18/18] doc: add vchecker document js1304 2017-11-28 7:48 ` js1304 2017-11-29 9:27 ` [PATCH 00/18] introduce a new tool, valid access checker Dmitry Vyukov 2017-11-29 9:27 ` Dmitry Vyukov 2017-12-01 7:46 ` Joonsoo Kim 2017-12-01 7:46 ` Joonsoo Kim 2017-12-22 1:51 ` Joonsoo Kim 2017-12-22 1:51 ` Joonsoo Kim 2018-01-18 22:39 ` Andrew Morton 2018-01-18 22:39 ` Andrew Morton
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=1511855333-3570-12-git-send-email-iamjoonsoo.kim@lge.com \ --to=js1304@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=aryabinin@virtuozzo.com \ --cc=dvyukov@google.com \ --cc=glider@google.com \ --cc=iamjoonsoo.kim@lge.com \ --cc=kasan-dev@googlegroups.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=namhyung@kernel.org \ --cc=wen.gang.wang@oracle.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.