From: Will Deacon Date: Wed, 19 Feb 2020 10:19:13 +0000 (+0000) Subject: arm64: memory: Add missing brackets to untagged_addr() macro X-Git-Tag: v5.4.23~88 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98583fb54c2b12002c15b0171a5b9c75cb2e578c;p=platform%2Fkernel%2Flinux-rpi.git arm64: memory: Add missing brackets to untagged_addr() macro commit d0022c0ef29b78bcbe8a5c5894bd2307143afce1 upstream. 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: Fixes: 597399d0cb91 ("arm64: tags: Preserve tags for addresses translated via TTBR1") Reported-by: Linus Torvalds Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index c23c4736..08df42e 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -219,7 +219,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; \ })