From: Andrey Konovalov <andreyknvl@google.com>
To: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org,
linux-media@vger.kernel.org, kvm@vger.kernel.org,
linux-kselftest@vger.kernel.org
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Will Deacon <will.deacon@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kees Cook <keescook@chromium.org>,
Yishai Hadas <yishaih@mellanox.com>,
Felix Kuehling <Felix.Kuehling@amd.com>,
Alexander Deucher <Alexander.Deucher@amd.com>,
Christian Koenig <Christian.Koenig@amd.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Jens Wiklander <jens.wiklander@linaro.org>,
Alex Williamson <alex.williamson@redhat.com>,
Leon Romanovsky <leon@kernel.org>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Dave Martin <Dave.Martin@arm.com>,
Khalid Aziz <khalid.aziz@oracle.com>, enh <enh@google.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Christoph Hellwig <hch@infradead.org>,
Dmitry Vyukov <dvyukov@google.com>,
Kostya Serebryany <kcc@google.com>,
Evgeniy Stepanov <eugenis@google.com>,
Lee Smith <Lee.Smith@arm.com>,
Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>,
Jacob Bramley <Jacob.Bramley@arm.com>,
Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Szabolcs Nagy <Szabolcs.Nagy@arm.com>,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v19 01/15] arm64: untag user pointers in access_ok and __uaccess_mask_ptr
Date: Tue, 23 Jul 2019 19:58:38 +0200 [thread overview]
Message-ID: <bc53284e2c95fd5b65809a1fb8169d4c1618c61b.1563904656.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1563904656.git.andreyknvl@google.com>
This patch is a part of a series that extends kernel ABI to allow to pass
tagged user pointers (with the top byte set to something else other than
0x00) as syscall arguments.
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.
Note, that this patch only temporarily untags the pointers to perform the
checks, but then passes them as is into the kernel internals.
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
arch/arm64/include/asm/uaccess.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 5a1c32260c1f..a138e3b4f717 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -62,6 +62,8 @@ static inline unsigned long __range_ok(const void __user *addr, unsigned long si
{
unsigned long ret, limit = current_thread_info()->addr_limit;
+ addr = untagged_addr(addr);
+
__chk_user_ptr(addr);
asm volatile(
// A + B <= C + 1 for all A,B,C, in four easy steps:
@@ -215,7 +217,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)
@@ -223,10 +226,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();
--
2.22.0.709.g102302147b-goog
next prev parent reply other threads:[~2019-07-23 17:59 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 17:58 [PATCH v19 00/15] arm64: untag user pointers passed to the kernel Andrey Konovalov
2019-07-23 17:58 ` Andrey Konovalov [this message]
2019-07-23 17:58 ` [PATCH v19 02/15] arm64: Introduce prctl() options to control the tagged user addresses ABI Andrey Konovalov
2019-07-31 17:05 ` Dave Hansen
2019-08-01 12:38 ` Kevin Brodsky
2019-08-01 16:45 ` Dave Hansen
2019-08-02 10:50 ` Catalin Marinas
2019-08-09 16:08 ` Catalin Marinas
2019-07-23 17:58 ` [PATCH v19 03/15] lib: untag user pointers in strn*_user Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 04/15] mm: untag user pointers passed to memory syscalls Andrey Konovalov
2019-08-09 16:03 ` Catalin Marinas
2019-07-23 17:58 ` [PATCH v19 05/15] mm: untag user pointers in mm/gup.c Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 06/15] mm: untag user pointers in get_vaddr_frames Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 07/15] fs/namespace: untag user pointers in copy_mount_options Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 08/15] userfaultfd: untag user pointers Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 09/15] drm/amdgpu: " Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 10/15] drm/radeon: untag user pointers in radeon_gem_userptr_ioctl Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 11/15] IB/mlx4: untag user pointers in mlx4_get_umem_mr Andrey Konovalov
2019-07-24 19:25 ` Jason Gunthorpe
2019-07-25 11:17 ` Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 12/15] media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 13/15] tee/shm: untag user pointers in tee_shm_register Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 14/15] vfio/type1: untag user pointers in vaddr_get_pfn Andrey Konovalov
2019-07-23 17:58 ` [PATCH v19 15/15] selftests, arm64: add a selftest for passing tagged pointers to kernel Andrey Konovalov
2019-07-23 18:03 ` [PATCH v19 00/15] arm64: untag user pointers passed to the kernel Andrey Konovalov
2019-07-24 14:02 ` Will Deacon
2019-07-24 14:16 ` Andrey Konovalov
2019-07-24 14:20 ` Will Deacon
2019-07-24 17:12 ` Vincenzo Frascino
2019-08-06 17:13 ` Will Deacon
2019-08-07 17:17 ` Andrey Konovalov
2019-08-08 21:12 ` Kees Cook
2019-08-08 22:33 ` Andrew Morton
2019-08-08 23:09 ` Kees Cook
2019-08-09 9:00 ` Catalin Marinas
2019-08-09 9:28 ` Dave Martin
2019-07-25 13:50 ` [PATCH v6 0/2] arm64 relaxed ABI Vincenzo Frascino
2019-07-25 13:50 ` [PATCH v6 1/2] arm64: Define Documentation/arm64/tagged-address-abi.rst Vincenzo Frascino
2019-07-30 10:32 ` Kevin Brodsky
2019-07-30 13:25 ` Vincenzo Frascino
2019-07-30 13:57 ` Kevin Brodsky
2019-07-30 14:24 ` Vincenzo Frascino
2019-07-30 14:48 ` Kevin Brodsky
2019-07-31 16:43 ` Dave Hansen
2019-08-02 10:08 ` Catalin Marinas
2019-07-25 13:50 ` [PATCH v6 2/2] arm64: Relax Documentation/arm64/tagged-pointers.rst Vincenzo Frascino
2019-07-31 16:50 ` [PATCH v19 00/15] arm64: untag user pointers passed to the kernel Dave Hansen
2019-08-01 12:11 ` Kevin Brodsky
2019-08-01 12:48 ` Andrey Konovalov
2019-08-01 15:36 ` Dave Hansen
2019-08-02 10:20 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bc53284e2c95fd5b65809a1fb8169d4c1618c61b.1563904656.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Alexander.Deucher@amd.com \
--cc=Christian.Koenig@amd.com \
--cc=Dave.Martin@arm.com \
--cc=Felix.Kuehling@amd.com \
--cc=Jacob.Bramley@arm.com \
--cc=Lee.Smith@arm.com \
--cc=Ramana.Radhakrishnan@arm.com \
--cc=Ruben.Ayrapetyan@arm.com \
--cc=Szabolcs.Nagy@arm.com \
--cc=akpm@linux-foundation.org \
--cc=alex.williamson@redhat.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=catalin.marinas@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=dvyukov@google.com \
--cc=enh@google.com \
--cc=eugenis@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=jens.wiklander@linaro.org \
--cc=jgg@ziepe.ca \
--cc=kcc@google.com \
--cc=keescook@chromium.org \
--cc=kevin.brodsky@arm.com \
--cc=khalid.aziz@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=leon@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-rdma@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=robin.murphy@arm.com \
--cc=vincenzo.frascino@arm.com \
--cc=will.deacon@arm.com \
--cc=yishaih@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).