From d3b4291c7eb7e6baf2fe8fd623ac59da0f3487b3 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 5 Sep 2022 23:05:36 +0200 Subject: [PATCH] BACKPORT: kasan: cosmetic changes in report.c (Backport: minor conflicts due to folio patchset not backported.) Do a few non-functional style fixes for the code in report.c. Link: https://lkml.kernel.org/r/b728eae71f3ea505a885449724de21cf3f476a7b.1662411799.git.andreyknvl@google.com Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Dmitry Vyukov Cc: Evgenii Stepanov Cc: Peter Collingbourne Signed-off-by: Andrew Morton Bug: 254721825 (cherry picked from commit 9ef08d265e3f02b3266a46f684de5741724bd7f8) Change-Id: I65a8acac26535cd9b546fcc40c53ffb37fec8194 Signed-off-by: Andrey Konovalov --- mm/kasan/report.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 4c9046d8042b..0d82173319a9 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -196,17 +196,15 @@ static void print_error_description(struct kasan_report_info *info) static void print_track(struct kasan_track *track, const char *prefix) { pr_err("%s by task %u:\n", prefix, track->pid); - if (track->stack) { + if (track->stack) stack_depot_print(track->stack); - } else { + else pr_err("(stack is not available)\n"); - } } struct page *kasan_addr_to_page(const void *addr) { - if ((addr >= (void *)PAGE_OFFSET) && - (addr < high_memory)) + if ((addr >= (void *)PAGE_OFFSET) && (addr < high_memory)) return virt_to_head_page(addr); return NULL; }