Commit 5f4af678 authored Dec 28, 2018 by Andrey Konovalov Committed by Alistair Delva Sep 24, 2019

UPSTREAM: kasan, arm64: untag address in _virt_addr_is_linear

(Upstream commit e71fe3f921aeb27f0c65ee7ebfdde7f8c7d60b74).

virt_addr_is_linear (which is used by virt_addr_valid) assumes that the
top byte of the address is 0xff, which isn't always the case with
tag-based KASAN.

This patch resets the tag in this macro.

Link: http://lkml.kernel.org/r/df73a37dd5ed37f4deaf77bc718e9f2e590e69b1.1544099024.git.andreyknvl@google.com


Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Bug: 128674696
Change-Id: I8b5de086ef1a63271bc72fefc3ab22f1bc9ac0a0

parent f8ce5f59

arch/arm64/include/asm/memory.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -326,9 +326,10 @@ static inline void *phys_to_virt(phys_addr_t x)
		#endif
		#endif

		#define _virt_addr_is_linear(kaddr) (((u64)(kaddr)) >= PAGE_OFFSET)
		#define virt_addr_valid(kaddr) (_virt_addr_is_linear(kaddr) && \
		_virt_addr_valid(kaddr))
		#define _virt_addr_is_linear(kaddr) \
		(__tag_reset((u64)(kaddr)) >= PAGE_OFFSET)
		#define virt_addr_valid(kaddr) \
		(_virt_addr_is_linear(kaddr) && _virt_addr_valid(kaddr))

		#include <asm-generic/memory_model.h>