From patchwork Thu Dec 6 12:24:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10715769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 13916109C for ; Thu, 6 Dec 2018 12:25:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 025E3297D0 for ; Thu, 6 Dec 2018 12:25:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAB882D393; Thu, 6 Dec 2018 12:25:27 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9307A297D0 for ; Thu, 6 Dec 2018 12:25:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD2446B7A05; Thu, 6 Dec 2018 07:25:08 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B4DE46B7A07; Thu, 6 Dec 2018 07:25:08 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98F546B7A08; Thu, 6 Dec 2018 07:25:08 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id 36D8E6B7A05 for ; Thu, 6 Dec 2018 07:25:08 -0500 (EST) Received: by mail-wr1-f70.google.com with SMTP id w16so81811wrk.10 for ; Thu, 06 Dec 2018 04:25:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UqMDiL5pFL/+tkei1G/AIx7zwZMP99eD4KugQS7K55g=; b=qX5aVg3bhi3r32FZ/Us4FhO7ZfoxishG2IX7gvq7aZSb2ldsTf5gajn/JB5PgA/x1m XKDA3DtO9vZ0bNCNzFWcJ4qD3ISkt6wEaPWOuUbbBT3iZu9bsG5yQnap/K75DvD/gzBb jU0K9aCpPafFeaYFw3QugIPQ3BONgEE/maN1ki1LFhqQpsB3iLBBTn+wr5hqUIr02iYh Go94DApO0odEtLPLtW9jcc+0vWuQ9GuPA4DHQPi3iGEQ5V7EcMdx+x1B8giDp4vH2D2u A3jKpkgtFOk+C93lW31udifGoS/dqT6ZKlA6Nvf7z8t5PMTTCcgVMLvzZebNVRpyqo3g Sv9Q== X-Gm-Message-State: AA+aEWZdf1teN4abLmMZGPFIR18EotNsm12+ZVidXbkjIXCcTIFP7iA/ Wqr+1eRjvpudIifrjPGH4joV+NKXg86lAl7/d1ZbI9ovpY/Rk4XERH8RsW9ETJnECSh4JBHkclr lTjW0JcLPz8Nr1jiZ8i4B9hSfIbQ0psQm6PojVBp9Ui6ZjKRLMTHZe5jJqMc4QibXb+4V/kJuur yVWfGwLb41x73EwsKlxilmlP13Al9JBibtWu8JETaZtL24TF6KDrmRw3yHVywAM1AaVZvO/JUil oTH60bNJEt2pUAGMqtCs8yrTJEmXaWFJJoxBOLOuhPiv8t+GVfOMc5odCnA8l+tVprimO14EQgz 9oXOb1XpQWf8371DuxKjN/HCz6GzVJBFusnVR58KYkXV/230rapuprHqakH4s5wHCgUwk9/7uu6 9 X-Received: by 2002:a1c:2d42:: with SMTP id t63mr2681344wmt.9.1544099107753; Thu, 06 Dec 2018 04:25:07 -0800 (PST) X-Received: by 2002:a1c:2d42:: with SMTP id t63mr2681284wmt.9.1544099106870; Thu, 06 Dec 2018 04:25:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544099106; cv=none; d=google.com; s=arc-20160816; b=PCZ6xOHYKQCBW9h261Yr/EQL81ehFWnnOdCnxpxVCrge9k1XcLVky4fTbpRXkymqSR FyLwQRCTLm8VQOTsovzTRGa4jbcdVzfaMdgMjv/ZFO8diH+BtRO0vspwlYeNszHQasSU uHPI1lOEU2GU4rNKeDxmQzyCiHi4OT9+I7+qjfB2Sv6oQk3DxE7/jVjPCiZHPa+opL1i fRuAj0h3QG9iI9VtdzwFoSG3cpSxE6kWdeyHEc6ds0tSngp0ekoAZARcskq+uOf1p35i 9tg/rmKKyfXpghE+nJnE5l3gxwDyADe/5tchqFvZ7u0QhuGC1jirUSNB+ckmiHhY5I7r 4r9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UqMDiL5pFL/+tkei1G/AIx7zwZMP99eD4KugQS7K55g=; b=S4L3UjQpWkxXEn5hxVCDNqmovH1duzAWwgvoCt81p3cxhbyn/HdOf5vFMfMOSAzjRO leY3aT/qX/KjW4IA76xLmWZABKny0BycOd4nWNSiXSGqiqoLg+dMyuyvkmmVNL8XzX+j 1fEGORpXIEDmbOtT5hGypvmPSUJMGAQsX7Ayrj2mqJWqW5V1Z5DNCtovasY+UsC9/1rH Sxt11f2OGLxLYNsiM0LZ1GPaWk+4BcsBfwaGqNPkfE6J0AJ41wjrWDhAwJsvHlsRudpB j8Et0BS1tFocu7q/PtFA4LoUKFMIatzfkRlLMF7MX8TIjXO5oymcj0gKv7VdRAdlpo98 32fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Y2VohwGt; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id s2sor492084wme.1.2018.12.06.04.25.06 for (Google Transport Security); Thu, 06 Dec 2018 04:25:06 -0800 (PST) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Y2VohwGt; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com 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 :mime-version:content-transfer-encoding; bh=UqMDiL5pFL/+tkei1G/AIx7zwZMP99eD4KugQS7K55g=; b=Y2VohwGtLIqo6t/3aMQeakdW1sJ7UgqyXRDUNidOjVdD5M1bxlNFiaWPSn1bXLUyyF mCCWKClMkXpRl/CkEYHFhkecgRkp6UBK6sfIgjgkARPZuNzpSqHnINsuMeuueMsTmNvD Mb970K6ZZtXOqMs4Gaek4O18mqjDkafHoZWEvQa4fKAWweR9DbpR2Q7eZR4APBPmIkFH N3qGtFuiC24t7PZgMXta7ZPzCIcCq8Yl7LCg8wCFP5JpIj2RfyVIiKy7tRwzK6WESWKq SjD/5xD4Wzs6YWFY2xHp4H4kAcqBkIOdh05TJR5kuzLQ14sH63IMtTkNdNhpUY1CH8hi OqTg== X-Google-Smtp-Source: AFSGD/UGniPFpytnR5EvX1mvUQCqi8xKkHyAIiafnkUS1yg6vUphxPqdq7r3o6WSEF+mrgSfvm3zrg== X-Received: by 2002:a1c:2007:: with SMTP id g7mr18924469wmg.79.1544099106379; Thu, 06 Dec 2018 04:25:06 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:3180:41f8:3010:ff61]) by smtp.gmail.com with ESMTPSA id j8sm339988wrt.40.2018.12.06.04.25.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 04:25:05 -0800 (PST) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Vishwath Mohan , Andrey Konovalov Subject: [PATCH v13 11/25] kasan, arm64: untag address in _virt_addr_is_linear Date: Thu, 6 Dec 2018 13:24:29 +0100 Message-Id: X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog In-Reply-To: References: MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP virt_addr_is_linear (which is used by virt_addr_valid) assumes that the top byte of the address is 0xff, which isn't always the case with tag-based KASAN. This patch resets the tag in this macro. Reviewed-by: Andrey Ryabinin Reviewed-by: Dmitry Vyukov Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/memory.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 83c1366a1233..5fe2353f111b 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -322,9 +322,10 @@ static inline void *phys_to_virt(phys_addr_t x) #endif #endif -#define _virt_addr_is_linear(kaddr) (((u64)(kaddr)) >= PAGE_OFFSET) -#define virt_addr_valid(kaddr) (_virt_addr_is_linear(kaddr) && \ - _virt_addr_valid(kaddr)) +#define _virt_addr_is_linear(kaddr) \ + (__tag_reset((u64)(kaddr)) >= PAGE_OFFSET) +#define virt_addr_valid(kaddr) \ + (_virt_addr_is_linear(kaddr) && _virt_addr_valid(kaddr)) #include