From patchwork Tue Oct 2 13:12:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10623629 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 051EC14BD for ; Tue, 2 Oct 2018 13:13:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC89D288FC for ; Tue, 2 Oct 2018 13:12:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA077288DD; Tue, 2 Oct 2018 13:12:59 +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 78A92288DD for ; Tue, 2 Oct 2018 13:12:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C29D46B000C; Tue, 2 Oct 2018 09:12:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B1AED6B000E; Tue, 2 Oct 2018 09:12:52 -0400 (EDT) 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 93D6F6B0010; Tue, 2 Oct 2018 09:12:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by kanga.kvack.org (Postfix) with ESMTP id 3281C6B000C for ; Tue, 2 Oct 2018 09:12:52 -0400 (EDT) Received: by mail-wr1-f69.google.com with SMTP id p12-v6so1622532wrt.19 for ; Tue, 02 Oct 2018 06:12:52 -0700 (PDT) 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=UwxTkI+pYsHu40iHWOY4wB/R27fPZGDmoFBeZbslwgQ=; b=Eu3Aw+in9gP64O/ml+4RIzAOeOxtMUQuMwqZ9QktwKGfTBDLdoDzm5QJdOf2IYho07 TWrvCrFMlaBIF2X+zxY1ojm8o35NUBkFZL7+m0iBoSs7K9U7GyTYpQ6h9TByF6sD6AbA wSehwmTqu96lQbspIPD1BCe7ZVB8Vx/GAA5nmnvOXW14SNKLoMXIuHhdRg+q67DeRrVS IIlhe57JnbkGTYDYckzLkuL8qa6zZXHwo13G+duEWxoBXNWYjqCMZ/ii2WQUd41QeDoJ J/4ray5beLZrnY/ZBHRSwzTpjysLAAzCeePrAj5jS2LMQrENx1KIWZ87n/v+ybZN393R +OSA== X-Gm-Message-State: ABuFfohE7+g+MpanYsYU/+GDoH7KmlmXQBHLmo9NNeoOq9pSAPjy9bbC 2v4rxflnKR9farCNRoeGKjQXchN6BbSMFqq+opfQHotdrvahVzfOFuaiCGQ8vawM12QDhWGUH4S LpG+jnYlMGE0WW+YichFBBuZS+h0l4niw+jDSSP8EI2lX6TVBtTgw1X96hly1CLt9CGmLIQQY6Q TD7wUi+JZ3V3UY85wskt5dcSynsHZ7O7kIk7HIpYzw+h6MYTaPngYeMvJVGHoCH0KyLFf2N2q3q n4Sms9PFpuHn//gV23l2rV2r9uPqUmgZALDE+Dm4/zzdrkbSQ3YHM7L7oVDR6mg5i8w4bIqTqu0 KbzPi1fypAQW/R8ScJRheaM/MGYrIQmgerKIywKRUf0qgHQb4NNK5DFG+8lX89KnID66YZv/2GV 4 X-Received: by 2002:a5d:6551:: with SMTP id z17-v6mr10137596wrv.194.1538485971734; Tue, 02 Oct 2018 06:12:51 -0700 (PDT) X-Received: by 2002:a5d:6551:: with SMTP id z17-v6mr10137549wrv.194.1538485970813; Tue, 02 Oct 2018 06:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538485970; cv=none; d=google.com; s=arc-20160816; b=gBBBjIsJbKABNDYVJEMDgg8qRDXgg7HhAoBe54eozDTxnaNBXe8ydCbikua2ex20Sb J+uMP/EbUZpjHKIHcK3Xwu9GRowOBPTTS2wReJy+RI3i9zDuD5WELU/69EJD09Wk8Mty aetXIvLl4o9dl7VK3+hhjElUCJzIHxLfh6D62PMYhL/y0Q0A+jn2Qe/vQS2f7Jnnhyjl 8AXp/EtloUmLzSa1TPOjNI83KHKs80w/+LxPA+2qi0VR/3qaaCet58Un+MCExkENKHf4 3GdAI/V6ygpmEjLWIKMoWP4HZYphIw5VDgODY94hH83Id6HNIZP2AN5TH7Y1TpuuLdXJ FuEQ== 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=UwxTkI+pYsHu40iHWOY4wB/R27fPZGDmoFBeZbslwgQ=; b=B6tJVHAfoQo44VeFXHToK5ZS8SWwonlICANB82ZKnmzwbc5Tr942VcSQOWGweBkdWC eioz62Iyzev71AVKfqMycYPzYHPYgPCodzs9dj68KZQXHkwVT2/7n0IFWgtJ89h4sK0o kOTUaMKTMo7lfReJtmo9iiQO9C/ba0ol+ji9uzIMfKMoCbyqjiwdWt6zB52KcaeFgYSw g0wxFDGsD6/Ku1VgwAXwEnvBCU9bOOEzab6uE9a0ukdvVz/9YcXJVgehk5zw7Wxho2w7 XyY2QtgM/ASDLnlf3P8dLqQBOP9O/dNc9WD2wfOtBnS8LUK2QmI1xNx7+4049tfGOr65 NoWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uOQ+FfmU; 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 79-v6sor8123862wmf.13.2018.10.02.06.12.50 for (Google Transport Security); Tue, 02 Oct 2018 06:12:50 -0700 (PDT) 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=uOQ+FfmU; 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=UwxTkI+pYsHu40iHWOY4wB/R27fPZGDmoFBeZbslwgQ=; b=uOQ+FfmUC+RaS3QyuW/9cJe9RH7pk1ltGJ/08pMGtCZU0scrsbZfvGCfzNFlnYWeR5 g4Vr9xESUkQ3uzvvWZq0xdqiM4GWXtOzvpTeiJAGBAFrgtHYW5APJNvA76dSQYg6AQ6U +HnGxnOWKMtPLutPQOCuJNs520+lOBa8RK6H5554UVrF0vYcw9e7fDpm51uyEaclf9he mlrY9jl92q9OeuR3mYmCoOs+LQInROEeHRG03TikcJ97tIw0t2mAJ68JeLA3lwRgRJ8x Pq5kHnJz2EmX3aXhV7wv8Shr2/YuRwwklttZlbsqxMfB4W5wvp501g+TByqSV28przNS TNVw== X-Google-Smtp-Source: ACcGV622sDyFt3S8csEmXThpDBNFNMvaRauKoxqXv/A4k50G/uwAP10xj9S7JvVx/Gl6W/hzjmgNeA== X-Received: by 2002:a1c:d4b:: with SMTP id 72-v6mr1969892wmn.102.1538485970324; Tue, 02 Oct 2018 06:12:50 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id v10-v6sm17458681wrp.0.2018.10.02.06.12.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 06:12:49 -0700 (PDT) From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Andrey Konovalov Subject: [PATCH v7 3/8] arm64: untag user addresses in access_ok and __uaccess_mask_ptr Date: Tue, 2 Oct 2018 15:12:38 +0200 Message-Id: <2b957e4f0a3133480dda9d9c8aeceb9b9d9378eb.1538485901.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-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 copy_from_user (and a few other similar functions) are used to copy data from user memory into the kernel memory or vice versa. Since a user can provided a tagged pointer to one of the syscalls that use copy_from_user, we need to correctly handle such pointers. Do this by untagging user pointers in access_ok and in __uaccess_mask_ptr, before performing access validity checks. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/uaccess.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 2d6451cbaa86..fa7318d3d7d5 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -105,7 +105,8 @@ static inline unsigned long __range_ok(const void __user *addr, unsigned long si #define untagged_addr(addr) \ ((__typeof__(addr))sign_extend64((__u64)(addr), 55)) -#define access_ok(type, addr, size) __range_ok(addr, size) +#define access_ok(type, addr, size) \ + __range_ok(untagged_addr(addr), size) #define user_addr_max get_fs #define _ASM_EXTABLE(from, to) \ @@ -237,7 +238,8 @@ static inline void uaccess_enable_not_uao(void) /* * Sanitise a uaccess pointer such that it becomes NULL if above the - * current addr_limit. + * current addr_limit. In case the pointer is tagged (has the top byte set), + * untag the pointer before checking. */ #define uaccess_mask_ptr(ptr) (__typeof__(ptr))__uaccess_mask_ptr(ptr) static inline void __user *__uaccess_mask_ptr(const void __user *ptr) @@ -245,10 +247,11 @@ static inline void __user *__uaccess_mask_ptr(const void __user *ptr) void __user *safe_ptr; asm volatile( - " bics xzr, %1, %2\n" + " bics xzr, %3, %2\n" " csel %0, %1, xzr, eq\n" : "=&r" (safe_ptr) - : "r" (ptr), "r" (current_thread_info()->addr_limit) + : "r" (ptr), "r" (current_thread_info()->addr_limit), + "r" (untagged_addr(ptr)) : "cc"); csdb();