Skip to contentSkip to conversation

kasan: fix incorrect arguments passing in kasan_add_zero_shadow

PATCH Applied Lecopzer Chen 2 participants 2 messages Jan 3, 2021 – Jan 8, 2021

Subsystems (3)
Memory management Arm MediaTek KASAN
lore
Share & tools
lore

Lecopzer Chen

author
#0 lore raw

PATCH 1/1 kasan: fix incorrect arguments passing in kasan_add_zero_shadow

kasan_remove_zero_shadow() shall use original virtual address, start and size, instead of shadow address.

Fixes 0207df4fa1a86 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN")
Signed-off-by Lecopzer Chen <[email protected]>
---
 mm/kasan/init.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/kasan/init.c +1 -2
index bc0ad208b3a7..67051cfae41c 100644
@@ -481,7 +481,6 @@ int kasan_add_zero_shadow(void *start, unsigned long size)
 
 	ret = kasan_populate_early_shadow(shadow_start, shadow_end);
 	if (ret)
-		kasan_remove_zero_shadow(shadow_start,
-					size >> KASAN_SHADOW_SCALE_SHIFT);
+		kasan_remove_zero_shadow(start, size);
 	return ret;
 }
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Lecopzer Chen

kasan_remove_zero_shadow() shall use original virtual address, start and size, instead of shadow address.

Fixes 0207df4fa1a86 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN")
Signed-off-by Lecopzer Chen <[email protected]>
---
 mm/kasan/init.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
mm/kasan/init.c +1 -3
index bc0ad208b3a7..67051cfae41c 100644
@@ -481,7 +481,6 @@ int kasan_add_zero_shadow(void *start, unsigned long size)
 
        ret = kasan_populate_early_shadow(shadow_start, shadow_end);
        if (ret)
-               kasan_remove_zero_shadow(shadow_start,
-                                       size >> KASAN_SHADOW_SCALE_SHIFT);
+               kasan_remove_zero_shadow(start, size);
        return ret;
 }
--
Quoted 1 line

2.25.1

Reviewed-by Andrey Konovalov <[email protected]>