| Message ID | 84dc684519c5de460c58b85f0351c4f9ab57e897.1603372719.git.andreyknvl@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kasan: hardware tag-based mode for production use on arm64 | expand |
On Thu, Oct 22, 2020 at 3:19 PM Andrey Konovalov <andreyknvl@google.com> wrote: > > There's no need for __kasan_unpoison_stack() helper, as it's only > currently used in a single place. Removing it also removes undeed > arithmetic. > > No functional changes. > > Signed-off-by: Andrey Konovalov <andreyknvl@google.com> > Link: https://linux-review.googlesource.com/id/Ie5ba549d445292fe629b4a96735e4034957bcc50 Reviewed-by: Dmitry Vyukov <dvyukov@google.com> > --- > mm/kasan/common.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index a3e67d49b893..9008fc6b0810 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -59,18 +59,12 @@ void kasan_disable_current(void) > #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > > #if CONFIG_KASAN_STACK > -static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) > -{ > - void *base = task_stack_page(task); > - size_t size = sp - base; > - > - kasan_unpoison_memory(base, size); > -} > - > /* Unpoison the entire stack for a task. */ > void kasan_unpoison_task_stack(struct task_struct *task) > { > - __kasan_unpoison_stack(task, task_stack_page(task) + THREAD_SIZE); > + void *base = task_stack_page(task); > + > + kasan_unpoison_memory(base, THREAD_SIZE); > } > > /* Unpoison the stack for the current task beyond a watermark sp value. */ > -- > 2.29.0.rc1.297.gfa9743e501-goog >
diff --git a/mm/kasan/common.c b/mm/kasan/common.c index a3e67d49b893..9008fc6b0810 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -59,18 +59,12 @@ void kasan_disable_current(void) #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ #if CONFIG_KASAN_STACK -static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) -{ - void *base = task_stack_page(task); - size_t size = sp - base; - - kasan_unpoison_memory(base, size); -} - /* Unpoison the entire stack for a task. */ void kasan_unpoison_task_stack(struct task_struct *task) { - __kasan_unpoison_stack(task, task_stack_page(task) + THREAD_SIZE); + void *base = task_stack_page(task); + + kasan_unpoison_memory(base, THREAD_SIZE); } /* Unpoison the stack for the current task beyond a watermark sp value. */
There's no need for __kasan_unpoison_stack() helper, as it's only currently used in a single place. Removing it also removes undeed arithmetic. No functional changes. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Link: https://linux-review.googlesource.com/id/Ie5ba549d445292fe629b4a96735e4034957bcc50 --- mm/kasan/common.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)