From c28566c8dedf80d9db432e62a5ba17e9378dbc38 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 5 Sep 2022 23:05:37 +0200 Subject: [PATCH] BACKPORT: kasan: use virt_addr_valid in kasan_addr_to_page/slab (Backport: minor conflicts due to folio patchset not backported.) Instead of open-coding the validity checks for addr in kasan_addr_to_page/slab(), use the virt_addr_valid() helper. Link: https://lkml.kernel.org/r/c22a4850d74d7430f8a6c08216fd55c2860a2b9e.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 2c9fb1fd1dd0b17cf8f48935a9c3ecea066f10e8) Change-Id: I42c472b32d795220b559922ed95481fab9acb4e4 Signed-off-by: Andrey Konovalov --- mm/kasan/report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 0d82173319a9..f16d5dcfa7a8 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -204,7 +204,7 @@ static void print_track(struct kasan_track *track, const char *prefix) struct page *kasan_addr_to_page(const void *addr) { - if ((addr >= (void *)PAGE_OFFSET) && (addr < high_memory)) + if (virt_addr_valid(addr)) return virt_to_head_page(addr); return NULL; }