s390/vmem: fix empty page tables cleanup under KASAN

[ Upstream commit 7eb8eb333f4131c53b2ca07a0d17a6d736462b5c ]

Commit 2245fe9cff28 ("s390/vmem: cleanup empty page tables") introduced
empty page tables cleanup in vmem code, but when the kernel is built
with KASAN enabled the code has no effect due to wrong KASAN shadow
memory intersection condition, which effectively ignores any memory
range below KASAN shadow. Fix intersection condition to make code
work as anticipated.

Fixes: 2245fe9cff28 ("s390/vmem: cleanup empty page tables")
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index ee1a97078527b7bd01e35a281746232fa3d42585..9a0ce5315f36de23c1e76b8da7d4a3a6151ca63b 100644 (file)
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -297,7 +297,7 @@ static void try_free_pmd_table(pud_t *pud, unsigned long start)
        if (end > VMALLOC_START)
                return;
 #ifdef CONFIG_KASAN
-       if (start < KASAN_SHADOW_END && KASAN_SHADOW_START > end)
+       if (start < KASAN_SHADOW_END && end > KASAN_SHADOW_START)
                return;
 #endif
        pmd = pmd_offset(pud, start);
@@ -372,7 +372,7 @@ static void try_free_pud_table(p4d_t *p4d, unsigned long start)
        if (end > VMALLOC_START)
                return;
 #ifdef CONFIG_KASAN
-       if (start < KASAN_SHADOW_END && KASAN_SHADOW_START > end)
+       if (start < KASAN_SHADOW_END && end > KASAN_SHADOW_START)
                return;
 #endif
 
@@ -426,7 +426,7 @@ static void try_free_p4d_table(pgd_t *pgd, unsigned long start)
        if (end > VMALLOC_START)
                return;
 #ifdef CONFIG_KASAN
-       if (start < KASAN_SHADOW_END && KASAN_SHADOW_START > end)
+       if (start < KASAN_SHADOW_END && end > KASAN_SHADOW_START)
                return;
 #endif