From patchwork Thu Aug 3 18:03:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 9879605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EFDEE603B4 for ; Thu, 3 Aug 2017 18:04:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9CE72894C for ; Thu, 3 Aug 2017 18:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB8C428946; Thu, 3 Aug 2017 18:04:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2098928946 for ; Thu, 3 Aug 2017 18:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=f9UKi5oyMUYgfmA2IfvOguQ3F/Omeq0hdup4e+XCZIw=; b=CqNtkIOZPoTS7uEwh5Ly2pdk8q 5qVzMAE4UPNN1qpNq2aBsohuNsN42PyniTRerCXFZP80BRh8JHgTSG8wdCpjMorHQz678VIcC7NT3 WO1WPdNvutuVOW43I0+8vy7O86e0pRxTeL6RxQB0todCayYzD/LjrfXtuIO2WtbqH4Lv+LgQpYVN0 lLa7Fpn5FF/Jf6QWV7LG13U3nZILfLL7b/zCaQxgGwnqTyDcs9q+NwDnhaMSEpujY/E3eD4N+w+3O Nk35qO5/W8YavWz9RYuZpipTMfrDIc6Hz4TSrnkuO9GaNtDrPdYe1jkLhcFC9No8Er/eGGft2zFba piNoqUfw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ddKUM-0004Xa-RS; Thu, 03 Aug 2017 18:04:50 +0000 Received: from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ddKUK-0004S5-9r for linux-arm-kernel@lists.infradead.org; Thu, 03 Aug 2017 18:04:49 +0000 Received: by mail-pg0-x22d.google.com with SMTP id y129so9113694pgy.4 for ; Thu, 03 Aug 2017 11:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VCx3gWxmLDYtPnH97XCLf8jeNqNyXmpiLLmRz4TNZE0=; b=aQnfFwn78yttkLwCfk26XEfWnkLuvCp/XRoClXaK+EeJwJ8cFvgBE7M6LMUWg1sIpX e1SYHJoRgqM2HkAIf0quNam0SUf0fznk2vUwDGVQ2oSPE45Qd/WfCjdRLBque9KgfYPW FulpjL729iRqhyfXibbKD+/GXX4SQalprMhIqQJNFX2PMfrc8ulBkBQAv1KJyktU+kx/ PIvloXkBd+hjkelGujycdznpL7dhGFastMquioazDkiLAMCIUHwcI5ZBx+lUhLwXkwtf LIo7w0zFjjIgdzw0YXLXDW8oxNjkp2pAMuK7t7msR7GIkiNup3jA5bhMS0QYh1MuK/fX f4TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VCx3gWxmLDYtPnH97XCLf8jeNqNyXmpiLLmRz4TNZE0=; b=SniVjbKt6Hb9TFr6RU2tM7sdvhB3pt2jQx3GVdT2BDi6/R1IO03qw1qlqDBOJSgqp9 SMKctdN153EAV0QH2+g7n7pfGK4bKH/b3LbQH5tuj8rMbDvSbjMeCm9EUJVb0oFBSHbn 5ppT3qabnek/eA+O+cgdOBdyhLheMSrfrWf1jjj7doxJ3nl2rhwNr3kEDhI1DFnh5CI3 Sm/suU2YyhJpimMmPHukFasu6Oo/y3F01z8wJI+sIwJv1Gvu2GQ2DSi5TyEcP73sG575 16h+f9wobrCfeNwtrPZNosSVYrxIrfxtQrISEPKsr2855lAHWDjH6bL0IFRBViHmsC9G 3V6A== X-Gm-Message-State: AIVw113mbnPTo8vAq3TCcCyuNPNN626uOQhtiytj77lg5xObGCDjxWtW 3TwRNExOaaOn1sPC X-Received: by 10.99.64.6 with SMTP id n6mr2358831pga.192.1501783466855; Thu, 03 Aug 2017 11:04:26 -0700 (PDT) Received: from ndesaulniers0.mtv.corp.google.com ([100.98.120.50]) by smtp.gmail.com with ESMTPSA id w7sm63416055pfw.25.2017.08.03.11.04.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Aug 2017 11:04:26 -0700 (PDT) From: Nick Desaulniers To: Subject: [PATCH v2] arm64: avoid overflow in VA_START and PAGE_OFFSET Date: Thu, 3 Aug 2017 11:03:58 -0700 Message-Id: <20170803180400.119270-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.14.0.rc1.383.gd1ce394fe2-goog In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170803_110448_374793_0CAD4539 X-CRM114-Status: GOOD ( 10.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , ard.biesheuvel@linaro.org, Catalin Marinas , Oleksandr Andrushchenko , Nick Desaulniers , dianders@chromium.org, ghackmann@google.com, linux-kernel@vger.kernel.org, mka@chromium.org, linux-arm-kernel@lists.infradead.org, srhines@google.com, Will Deacon , pirama@google.com, akpm@linux-foundation.org, Laura Abbott , Neeraj Upadhyay , zijun_hu@htc.com, Alexander Popov MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The bitmask used to define these values produces overflow, as seen by this compiler warning: arch/arm64/kernel/head.S:47:8: warning: integer overflow in preprocessor expression #elif (PAGE_OFFSET & 0x1fffff) != 0 ^~~~~~~~~~~ arch/arm64/include/asm/memory.h:52:46: note: expanded from macro 'PAGE_OFFSET' #define PAGE_OFFSET (UL(0xffffffffffffffff) << (VA_BITS - 1)) ~~~~~~~~~~~~~~~~~~ ^ It would be preferrable to use GENMASK_ULL() instead, but it's not set up to be used from assembly (the UL() macro token pastes UL suffixes when not included in assembly sources). Suggested-by: Ard Biesheuvel Suggested-by: Yury Norov Suggested-by: Matthias Kaehlcke Signed-off-by: Nick Desaulniers --- arch/arm64/include/asm/memory.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 32f82723338a..ef39dcb9ca6a 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -64,8 +64,10 @@ * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area. */ #define VA_BITS (CONFIG_ARM64_VA_BITS) -#define VA_START (UL(0xffffffffffffffff) << VA_BITS) -#define PAGE_OFFSET (UL(0xffffffffffffffff) << (VA_BITS - 1)) +#define VA_START (UL(0xffffffffffffffff) - \ + (UL(1) << VA_BITS) + 1) +#define PAGE_OFFSET (UL(0xffffffffffffffff) - \ + (UL(1) << (VA_BITS - 1)) + 1) #define KIMAGE_VADDR (MODULES_END) #define MODULES_END (MODULES_VADDR + MODULES_VSIZE) #define MODULES_VADDR (VA_START + KASAN_SHADOW_SIZE)