Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kasan: fix last shadow judgement in memory_is_poisoned_16()

The shadow which correspond 16 bytes memory may span 2 or 3 bytes. If
the memory is aligned on 8, then the shadow takes only 2 bytes. So we
check "shadow_first_bytes" is enough, and need not to call
"memory_is_poisoned_1(addr + 15);". But the code "if
(likely(!last_byte))" is wrong judgement.

e.g. addr=0, so last_byte = 15 & KASAN_SHADOW_MASK = 7, then the code
will continue to call "memory_is_poisoned_1(addr + 15);"

Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andrey Konovalov <adech.fo@gmail.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Michal Marek <mmarek@suse.cz>
Cc: <zhongjiang@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Xishi Qiu and committed by
Linus Torvalds
8d77a6d1 3aaf14da

+1 -2
+1 -2
mm/kasan/kasan.c
··· 135 135 136 136 if (unlikely(*shadow_addr)) { 137 137 u16 shadow_first_bytes = *(u16 *)shadow_addr; 138 - s8 last_byte = (addr + 15) & KASAN_SHADOW_MASK; 139 138 140 139 if (unlikely(shadow_first_bytes)) 141 140 return true; 142 141 143 - if (likely(!last_byte)) 142 + if (likely(IS_ALIGNED(addr, 8))) 144 143 return false; 145 144 146 145 return memory_is_poisoned_1(addr + 15);