From patchwork Thu Feb 27 13:36:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 230300 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37136C76566 for ; Thu, 27 Feb 2020 14:27:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05D0324656 for ; Thu, 27 Feb 2020 14:27:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813665; bh=SQVAAP2kvL9u7b94qtrIiV64wIKilRpYbocpTnql3gE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pNxZJqj7XrMmBBILUqKcHr1/2HAu0g7td8r8dm838RFyTq47qxKi1n8xyPZa+zQSo N4PbsVRYbF/HyjkPC/pDZjA0T9wxVjwe64QytiglYrrzEQYjU31j0KsPux7G+3iB7C Sz/3iKFwVaCLyHhXCFWdzIE12Tp+bfuGqEKgPLtw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387538AbgB0OIn (ORCPT ); Thu, 27 Feb 2020 09:08:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:46544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388283AbgB0OIm (ORCPT ); Thu, 27 Feb 2020 09:08:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CB75224656; Thu, 27 Feb 2020 14:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812521; bh=SQVAAP2kvL9u7b94qtrIiV64wIKilRpYbocpTnql3gE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bEcj03dYUFjdiyWExTTap45tC3mYHOTQjHBydb2b8KdpDcWhZPCuv1KscD/KxRIjQ XdI9h++IiX+ZEBuY0OFvy0v/kyGZHZ6fyYJcphCYxIFkAkNh9lMD/P7iQVRnkFOKU/ lpiahKcpZ1uQvr9/6/28+IEwjzhzurcQ68rh+/sU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Torvalds , Will Deacon Subject: [PATCH 5.4 049/135] arm64: memory: Add missing brackets to untagged_addr() macro Date: Thu, 27 Feb 2020 14:36:29 +0100 Message-Id: <20200227132236.508445029@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132228.710492098@linuxfoundation.org> References: <20200227132228.710492098@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon 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 --- 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; \ })