Commit 1ec38452 authored Feb 19, 2020 by Will Deacon Committed by Alistair Delva Mar 13, 2020

UPSTREAM: arm64: memory: Add missing brackets to untagged_addr() macro



(Upstream commit d0022c0ef29b78bcbe8a5c5894bd2307143afce1.)

Add brackets around the evaluation of the 'addr' parameter to the
untagged_addr() macro so that the cast to 'u64' applies to the result
of the expression.

Cc: <stable@vger.kernel.org>
Fixes: 597399d0cb91 ("arm64: tags: Preserve tags for addresses translated via TTBR1")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Will Deacon <will@kernel.org>
Bug: 135692346
Change-Id: I1bce8f6a185258a365aaa292483fabc02519301f
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>

parent 52fe54e4

arch/arm64/include/asm/memory.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ static inline unsigned long kaslr_offset(void)
		((__force __typeof__(addr))sign_extend64((__force u64)(addr), 55))

		#define untagged_addr(addr) ({ \
		u64 __addr = (__force u64)addr; \
		u64 __addr = (__force u64)(addr); \
		__addr &= __untagged_addr(__addr); \
		(__force __typeof__(addr))__addr; \
		})