From: Catalin Marinas <catalin.marinas@arm.com>
To: Kees Cook <keescook@chromium.org>
Cc: Andrey Konovalov <andreyknvl@google.com>,
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,
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>,
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>
Subject: Re: [PATCH v16 02/16] arm64: untag user pointers in access_ok and __uaccess_mask_ptr
Date: Mon, 10 Jun 2019 19:53:30 +0100 [thread overview]
Message-ID: <20190610185329.xhjawzfy4uddrkrj@mbp> (raw)
In-Reply-To: <201906101106.3CA50745E3@keescook>
On Mon, Jun 10, 2019 at 11:07:03AM -0700, Kees Cook wrote:
> On Mon, Jun 10, 2019 at 06:53:27PM +0100, Catalin Marinas wrote:
> > On Mon, Jun 03, 2019 at 06:55:04PM +0200, Andrey Konovalov wrote:
> > > diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
> > > index e5d5f31c6d36..9164ecb5feca 100644
> > > --- a/arch/arm64/include/asm/uaccess.h
> > > +++ b/arch/arm64/include/asm/uaccess.h
> > > @@ -94,7 +94,7 @@ static inline unsigned long __range_ok(const void __user *addr, unsigned long si
> > > return ret;
> > > }
> > >
> > > -#define access_ok(addr, size) __range_ok(addr, size)
> > > +#define access_ok(addr, size) __range_ok(untagged_addr(addr), size)
[...]
> > diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
> > index 3767fb21a5b8..fd191c5b92aa 100644
> > --- a/arch/arm64/kernel/process.c
> > +++ b/arch/arm64/kernel/process.c
> > @@ -552,3 +552,18 @@ void arch_setup_new_exec(void)
> >
> > ptrauth_thread_init_user(current);
> > }
> > +
> > +/*
> > + * Enable the relaxed ABI allowing tagged user addresses into the kernel.
> > + */
> > +int untagged_uaddr_set_mode(unsigned long arg)
> > +{
> > + if (is_compat_task())
> > + return -ENOTSUPP;
> > + if (arg)
> > + return -EINVAL;
> > +
> > + set_thread_flag(TIF_UNTAGGED_UADDR);
> > +
> > + return 0;
> > +}
>
> I think this should be paired with a flag clearing in copy_thread(),
> yes? (i.e. each binary needs to opt in)
It indeed needs clearing though not in copy_thread() as that's used on
clone/fork but rather in flush_thread(), called on the execve() path.
And a note to myself: I think PR_UNTAGGED_ADDR (not UADDR) looks better
in a uapi header, the user doesn't differentiate between uaddr and
kaddr.
--
Catalin
next prev parent reply other threads:[~2019-06-10 18:53 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 16:55 [PATCH v16 00/16] arm64: untag user pointers passed to the kernel Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 01/16] uaccess: add untagged_addr definition for other arches Andrey Konovalov
2019-06-03 17:02 ` Khalid Aziz
2019-06-03 17:06 ` Andrey Konovalov
2019-06-03 17:24 ` Khalid Aziz
2019-06-03 17:29 ` Christoph Hellwig
2019-06-03 18:17 ` Khalid Aziz
2019-06-04 11:45 ` Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 02/16] arm64: untag user pointers in access_ok and __uaccess_mask_ptr Andrey Konovalov
2019-06-08 3:51 ` Kees Cook
2019-06-10 17:53 ` Catalin Marinas
2019-06-10 18:07 ` Kees Cook
2019-06-10 18:53 ` Catalin Marinas [this message]
2019-06-10 20:36 ` Kees Cook
2019-06-11 14:57 ` Catalin Marinas
2019-06-11 17:09 ` Vincenzo Frascino
2019-06-12 9:32 ` Catalin Marinas
2019-06-12 11:52 ` Vincenzo Frascino
2019-06-11 17:09 ` Andrey Konovalov
2019-06-11 17:39 ` Catalin Marinas
2019-06-12 11:03 ` Andrey Konovalov
2019-06-12 11:04 ` Catalin Marinas
2019-06-03 16:55 ` [PATCH v16 03/16] lib, arm64: untag user pointers in strn*_user Andrey Konovalov
2019-06-08 3:48 ` Kees Cook
2019-06-11 20:06 ` Khalid Aziz
2019-06-03 16:55 ` [PATCH v16 04/16] mm: untag user pointers in do_pages_move Andrey Konovalov
2019-06-08 3:49 ` Kees Cook
2019-06-11 20:18 ` Khalid Aziz
2019-06-12 11:08 ` Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 05/16] arm64: untag user pointers passed to memory syscalls Andrey Konovalov
2019-06-08 3:51 ` Kees Cook
2019-06-10 14:28 ` Catalin Marinas
2019-06-11 15:35 ` Andrey Konovalov
2019-06-11 17:44 ` Catalin Marinas
2019-06-12 11:13 ` Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 06/16] mm, arm64: untag user pointers in mm/gup.c Andrey Konovalov
2019-06-08 3:59 ` Kees Cook
2019-06-03 16:55 ` [PATCH v16 07/16] mm, arm64: untag user pointers in get_vaddr_frames Andrey Konovalov
2019-06-08 4:00 ` Kees Cook
2019-06-10 14:29 ` Catalin Marinas
2019-06-03 16:55 ` [PATCH v16 08/16] fs, arm64: untag user pointers in copy_mount_options Andrey Konovalov
2019-06-08 4:02 ` Kees Cook
2019-06-11 14:38 ` Andrey Konovalov
2019-06-12 11:36 ` Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 09/16] fs, arm64: untag user pointers in fs/userfaultfd.c Andrey Konovalov
2019-06-08 4:03 ` Kees Cook
2019-06-12 10:45 ` Catalin Marinas
2019-06-03 16:55 ` [PATCH v16 10/16] drm/amdgpu, arm64: untag user pointers Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 11/16] drm/radeon, arm64: untag user pointers in radeon_gem_userptr_ioctl Andrey Konovalov
2019-06-03 16:55 ` [PATCH v16 12/16] IB, arm64: untag user pointers in ib_uverbs_(re)reg_mr() Andrey Konovalov
2019-06-03 17:46 ` Jason Gunthorpe
2019-06-04 12:18 ` Andrey Konovalov
2019-06-04 12:27 ` Jason Gunthorpe
2019-06-04 12:45 ` Andrey Konovalov
2019-06-04 13:02 ` Jason Gunthorpe
2019-06-04 13:09 ` Andrey Konovalov
2019-06-12 11:01 ` Catalin Marinas
2019-06-03 16:55 ` [PATCH v16 13/16] media/v4l2-core, arm64: untag user pointers in videobuf_dma_contig_user_get Andrey Konovalov
2019-06-08 3:52 ` Kees Cook
2019-06-03 16:55 ` [PATCH v16 14/16] tee, arm64: untag user pointers in tee_shm_register Andrey Konovalov
2019-06-07 5:33 ` Jens Wiklander
2019-06-08 4:05 ` Kees Cook
2019-06-03 16:55 ` [PATCH v16 15/16] vfio/type1, arm64: untag user pointers in vaddr_get_pfn Andrey Konovalov
2019-06-08 3:58 ` Kees Cook
2019-06-12 10:38 ` Catalin Marinas
2019-06-03 16:55 ` [PATCH v16 16/16] selftests, arm64: add a selftest for passing tagged pointers to kernel Andrey Konovalov
2019-06-08 3:56 ` Kees Cook
2019-06-10 22:08 ` shuah
2019-06-11 15:01 ` Catalin Marinas
2019-06-11 17:18 ` Andrey Konovalov
2019-06-11 17:50 ` Catalin Marinas
2019-06-12 11:14 ` Andrey Konovalov
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=20190610185329.xhjawzfy4uddrkrj@mbp \
--to=catalin.marinas@arm.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=andreyknvl@google.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).