lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 049/135] arm64: memory: Add missing brackets to untagged_addr() macro
    Date
    From: Will Deacon <will@kernel.org>

    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: <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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm64/include/asm/memory.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/arm64/include/asm/memory.h
    +++ b/arch/arm64/include/asm/memory.h
    @@ -219,7 +219,7 @@ static inline unsigned long kaslr_offset
    ((__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; \
    })

    \
     
     \ /
      Last update: 2020-02-27 15:09    [W:4.088 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site