From patchwork Wed Jun 20 15:24:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10477761 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 463DD600F6 for ; Wed, 20 Jun 2018 15:27:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 344D828A8E for ; Wed, 20 Jun 2018 15:27:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 276BA28DDB; Wed, 20 Jun 2018 15:27:17 +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=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 B105B28A8E for ; Wed, 20 Jun 2018 15:27:16 +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=4A+BsgT0JQjGuToHX/zvQOouiY/95YabBb69QTHCWo0=; b=UkZpbgS+MtLg4bQuRTwWhmH8cP +j4R4aU2JWWY+lPa3sGxcIKdolRm/TbssqU72ufgTUhgjjpLrFNvXXG7Pt4GfJ2xUPagVNazN8NXk evAQT5Xb9P6fxj9IEdp8brFju1OSgy5bpzf6KvKZHTP3w3eExRuJjybaBj4DuufJK8hgVIaqEad4w PfPG5C20cQwMMmODmqYHf1zxa/1UZ3tXHN5T9NboqbGHll/dovPcPRlJBACmqO63uQvWZaxAtnYSC f5qb8Vv5RL/DevKCz1WX7qjC9ddKohsvzw3ZVO85A8/ci01pjAoUcxbS1cwVa8SXx4Fyal8WIuGIM jHGrTGMQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fVf0q-0007ks-Rh; Wed, 20 Jun 2018 15:27:12 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fVeyU-000591-B4 for linux-arm-kernel@lists.infradead.org; Wed, 20 Jun 2018 15:24:50 +0000 Received: by mail-wm0-x243.google.com with SMTP id p11-v6so203410wmc.4 for ; Wed, 20 Jun 2018 08:24:35 -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=m9bM2usci+57xc3zRMgpKMd80JVfANdAQuqRMxrSXbE=; b=P4QMe9eUNQNmUEDFBBlBegREw9qogy95KBK5zhWridJ7KAYuu4P4qoJ4RSKpU9A9uj 5fca0DIDVpiHr/mfdFgE3ofA/Enl3ijcfpPqVwDoidv/ZBmJd3UfR+UiNCeMZof4XCST 4C/1T1Yp+k36uWBvPwnzfbw0QykFayqOyUY5ncoD2eTJsW/QASmCkGs/GutEvLYzNuJj 869lLy8dgvSAUBlgEVAbePvzExXpPUkKx6xwcWa6d2c6HPYOArGLmbtV9voMXMuXOIDR Yv0PUDda2BBkNvrXOwhUkwNT0fQrGVD3726M/2PMhCspWsSHXdrSHi0Ge+6EaYp8cb5d tjdg== 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=m9bM2usci+57xc3zRMgpKMd80JVfANdAQuqRMxrSXbE=; b=iETZdnGLi14nnhTRzrrdFVRehzZSo1IIBn00nzBqFVtfeA6mIR0eMRlIZSyoj0YLlp gN8+9hfsZ0hMqCZZRB04nUtbQu41cnqlb8t7bq6O5yCCIT7XcS3iAVsNDplXta3oNBCu viBBrZRTWjfK/+X8T4ylA6k8ByIK9Y5F9VBPdF3ANDy863LPg7TSnPpGg7Pp/xd4p4rh X/GbdjcOPaUI59laydJ1uZUbQ03HsFt+lUwI3Hcsve9mYICzt3hnjVNBJgHg+WAINd8i S/nBn1Gg9t5tOdRP+aLb48LXId7oiAmDkPHYL+VNH6ytoFqbdz6/CQEyqYDvNVx9bNg+ PPnw== X-Gm-Message-State: APt69E2hLfUOBrqVi8KxMTqqKItP4Nb7yA0E/NGe9g5vajPpIIvzwe6z pxyipKkQ8D8h0cHMz/ZxqaX0hA== X-Google-Smtp-Source: ADUXVKLQqaSurFJRIyHjy++pghmW5yD8Wq8MdxfPzk2iZvkneLGTJmoAUuaWj2bOKS5adHS07hEvOA== X-Received: by 2002:a1c:9015:: with SMTP id s21-v6mr2104314wmd.20.1529508274166; Wed, 20 Jun 2018 08:24:34 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id c11-v6sm3959244wrm.65.2018.06.20.08.24.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 08:24:33 -0700 (PDT) From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Al Viro , Andrey Konovalov , 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 Subject: [PATCH v4 3/7] arm64: untag user addresses in access_ok and __uaccess_mask_ptr Date: Wed, 20 Jun 2018 17:24:22 +0200 Message-Id: <69573b1f821c5068be21fdff556cef11f03a09b4.1529507994.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180620_082446_404670_61E50E8B X-CRM114-Status: GOOD ( 13.98 ) 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: Chintan Pandya , Jacob Bramley , Ruben Ayrapetyan , Lee Smith , Kostya Serebryany , Dmitry Vyukov , Ramana Radhakrishnan , Evgeniy Stepanov 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 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();