From patchwork Mon Nov 19 17:26:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10689033 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 896F114E2 for ; Mon, 19 Nov 2018 17:27:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C0FE2A2B5 for ; Mon, 19 Nov 2018 17:27:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F17F2A2BA; Mon, 19 Nov 2018 17:27:29 +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=ham 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 DA9C52A2B5 for ; Mon, 19 Nov 2018 17:27:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96BC56B1B8B; Mon, 19 Nov 2018 12:27:14 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 946436B1B8C; Mon, 19 Nov 2018 12:27:14 -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 7499B6B1B8D; Mon, 19 Nov 2018 12:27:14 -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 1C79F6B1B8B for ; Mon, 19 Nov 2018 12:27:14 -0500 (EST) Received: by mail-wr1-f70.google.com with SMTP id x3so18443173wru.22 for ; Mon, 19 Nov 2018 09:27:14 -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=1YhKty0PhBPSl7VZmDwGA+CXyNSRUPKrtcyaCeImY3A=; b=c15DT+Wfo3eEqXbPzFCnGJslhu1k3Ai4iF2gelR7tdsQMSwiOxjo3RzdniSjMZaNcb RDsA6iQMBmKfD0tPBXHystVL5bdd3I5qygzoMErv5AiXPC2kJrK9Nd5ln/eo4ugJWI5Q tD3yBMCBljLFtdlS7nB+dRs/Qved/bIHXZ11qmwmXrbe0sMZjqZDaiQJJMkW2PrAbPvE RhIc+ZAKm6+yf7pwiYW3zaOHNr3IS2Eo+ubBJlsPakWz/TsHFDbc8KBhXX3aQknezYWZ 2JgZt4mkKvmwuHVmvPn8xq62x2RlXVHNOk+Xj/RJqdsf0lhxFXhTjBcOFErLaSbQc3nf IgnA== X-Gm-Message-State: AA+aEWY+7wdHEhnKPP34wYRUxGdkjZOrl/ZcAXP6tymZ57zqEG6qKEQY l6uPw/g3aIGdWNCpO+8gRbmnMlKpaYtWjE7P7DFeWZTfmRYTQp1G/QSC6IOMjcvEyC0/ywrESSd WOtsOjrkf+KxHenrrVGDg8xCaEvxGu5mBnXh235M/sm4yo7XqRwc27Bl670jO4qv/choNqgTmdM gVxKHFpDMfREpfNJJnOuBxtWai4gCttLsvOElOt16eHGix8GjAg+dLe8Jzn0Z/NPkv+poQIMoXI wzoyXQ50wqIoofwG/d+mztZBdmO6HoawWWegj1wJ3+G5cc4sTawaQx8l2iJL20tnGDLvKyw8cWW TjLKvYu8Qz75PXgDEmd/B/PpfBrd0A3xhqJV+SIJySJimd4OWXjvYEwgy9OGHlq7/WU7RRebypR f X-Received: by 2002:a5d:4609:: with SMTP id t9-v6mr9005467wrq.198.1542648433642; Mon, 19 Nov 2018 09:27:13 -0800 (PST) X-Received: by 2002:a5d:4609:: with SMTP id t9-v6mr9005430wrq.198.1542648432967; Mon, 19 Nov 2018 09:27:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542648432; cv=none; d=google.com; s=arc-20160816; b=nJpFx0ulFgAFFPJvy4jxmDl4bMTo6mIeJT7GLTZZ2eSuCLnl+b5OJOWdDx3UNx5c2j kA+jzTWXXXfLGZIOE7bpBAj7i3Fz7L/uucEqlaA9DDXOWl+2/LpG1FfQsbQsLxhmORD4 A/cEaQgUrzW1pnAU5cnEKI+vMrZd8Ajz2Zp3Bcwea5Od/22a7EZUGX98PT3G3Pkq4tXa C+Lij6RsfWnsV0emH7ttB38W1pUNaYPa4YT5OzykgTDi72W6K4wbKRVxFemteGF7+L1a 6YSf/9a/iBQp+NGoZIQTFDv7VTD8MTUTOhFssbfK3Fo3NMnOj7P7gKauUp6oSMRsvdeQ Q71A== 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=1YhKty0PhBPSl7VZmDwGA+CXyNSRUPKrtcyaCeImY3A=; b=O67jw5/Z7+DRnzHkAPaMEjX7oZA0lhijXRrRDvEUXnqn0tNh/o0wj9s+8whvXnZVJu GfpaHSSkYRHbKeuavq0TZ6jBHzxzVGV/YI89XrGjZXCwd8f+K33/ajr3Ra49x4Cy3XoY u0/HRlmOvJiq9t+Eyz/xjPpK6lQvhkHMUJ1Qgo14ns++737PQowGn6jbVpHWKZtLFHVe gGzP/lzlCvsRJ7S8HmZlWjUOmr70AebpvBsA+ksF5QRFP/V5zSuHlsjFUgV7pjrtQ956 Kw43jLd8MrhqobEcWUyusmWHD+1NzVq7xTdlWsCBm+pz6+sHCYCQAcNusIN5KrAUrhC/ IMHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=DnG4e1wJ; 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 r2-v6sor18569538wma.5.2018.11.19.09.27.12 for (Google Transport Security); Mon, 19 Nov 2018 09:27:12 -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=DnG4e1wJ; 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=1YhKty0PhBPSl7VZmDwGA+CXyNSRUPKrtcyaCeImY3A=; b=DnG4e1wJQP7UD6p6zIz57/Rv8pyRn6SQ8HJI0SVPFeiAkkFExKONMAX5F3DnTwyOah jlxMnrHVidMA0iBppEJreCsRSZSmTCkl/vQmtwv0zX6Sis02dF/q6YhQ0tuCy9MevN62 sQnySQ2k9tiaKs3VCMmHZXVu9sAg3dZd0ofuLPUfas+VFLIU3xWkBt67dN/j+gfvjNyn ADr69OpHpZ7rV9SYeeb6A5M6p0ilZbXkzmlesFgYR2iDng071A9Gvk8BwkHiV+uNzaQS iNToRyorfV5Ah8VewgqY0Tvh7DIQKHsYjgQbuZmxuHMlH5BYYFYK+ZXOLD1F3BODIn59 cHtQ== X-Google-Smtp-Source: AJdET5erzvm32b8ZF3d92FQfSjsREk6d9aLRHY/YmUcwUo+OxmSXKpVoDAiZpQ39XDdOFZWvSxgUJw== X-Received: by 2002:a7b:ca44:: with SMTP id m4mr7741735wml.76.1542648432514; Mon, 19 Nov 2018 09:27:12 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:3180:41f8:3010:ff61]) by smtp.gmail.com with ESMTPSA id l143-v6sm23685190wmb.23.2018.11.19.09.27.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 09:27:11 -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 v11 11/24] kasan, arm64: untag address in _virt_addr_is_linear Date: Mon, 19 Nov 2018 18:26:27 +0100 Message-Id: <5cb565e6a6b17eceb6590a33d84208f725cf8dc2.1542648335.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-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 ae741827039c..ddad7df77027 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