diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-18 09:25:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-18 09:25:12 +0200 |
| commit | d6a367853b4340768a917a9e67127231cfd97218 (patch) | |
| tree | 525aad2698e5551357311c2090b2d16f54d42f08 /mm/kasan/kasan.c | |
| parent | 84567995612258c23bc55795575babe7ef605dd9 (diff) | |
| parent | a7d5c189719846889c029c34e24e166a465368fa (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/kasan/kasan.c')
| -rw-r--r-- | mm/kasan/kasan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index 7b28e9cdf1c7..8da211411b57 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -135,12 +135,11 @@ static __always_inline bool memory_is_poisoned_16(unsigned long addr) if (unlikely(*shadow_addr)) { u16 shadow_first_bytes = *(u16 *)shadow_addr; - s8 last_byte = (addr + 15) & KASAN_SHADOW_MASK; if (unlikely(shadow_first_bytes)) return true; - if (likely(!last_byte)) + if (likely(IS_ALIGNED(addr, 8))) return false; return memory_is_poisoned_1(addr + 15); |