From: Lokesh Gidra <lokeshgidra@google.com>
To: Kees Cook <keescook@chromium.org>,
Jonathan Corbet <corbet@lwn.net>, Peter Xu <peterx@redhat.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
Stephen Smalley <stephen.smalley.work@gmail.com>,
Eric Biggers <ebiggers@kernel.org>,
Daniel Colascione <dancol@dancol.org>,
"Joel Fernandes (Google)" <joel@joelfernandes.org>,
Linux FS Devel <linux-fsdevel@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-doc@vger.kernel.org, Kalesh Singh <kaleshsingh@google.com>,
Calin Juravle <calin@google.com>,
Suren Baghdasaryan <surenb@google.com>,
Jeffrey Vander Stoep <jeffv@google.com>,
"Cc: Android Kernel" <kernel-team@android.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>, Shaohua Li <shli@fb.com>,
Jerome Glisse <jglisse@redhat.com>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Mel Gorman <mgorman@techsingularity.net>,
Nitin Gupta <nigupta@nvidia.com>,
Vlastimil Babka <vbabka@suse.cz>,
Iurii Zaikin <yzaikin@google.com>,
Luis Chamberlain <mcgrof@kernel.org>,
"open list:MEMORY MANAGEMENT" <linux-mm@kvack.org>
Subject: Re: [PATCH v6 1/2] Add UFFD_USER_MODE_ONLY
Date: Thu, 19 Nov 2020 19:09:34 -0800 [thread overview]
Message-ID: <CA+EESO6xfnRWD2xrmar6VrcWBA8P53J8gVZmOtR0Ri65yb-Q4w@mail.gmail.com> (raw)
In-Reply-To: <20201120030411.2690816-2-lokeshgidra@google.com>
On Thu, Nov 19, 2020 at 7:04 PM Lokesh Gidra <lokeshgidra@google.com> wrote:
>
> userfaultfd handles page faults from both user and kernel code.
> Add a new UFFD_USER_MODE_ONLY flag for userfaultfd(2) that makes
> the resulting userfaultfd object refuse to handle faults from kernel
> mode, treating these faults as if SIGBUS were always raised, causing
> the kernel code to fail with EFAULT.
>
> A future patch adds a knob allowing administrators to give some
> processes the ability to create userfaultfd file objects only if they
> pass UFFD_USER_MODE_ONLY, reducing the likelihood that these processes
> will exploit userfaultfd's ability to delay kernel page faults to open
> timing windows for future exploits.
>
> Signed-off-by: Daniel Colascione <dancol@google.com>
> Signed-off-by: Lokesh Gidra <lokeshgidra@google.com>
> Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
> ---
> fs/userfaultfd.c | 10 +++++++++-
> include/uapi/linux/userfaultfd.h | 9 +++++++++
> 2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
> index 000b457ad087..605599fde015 100644
> --- a/fs/userfaultfd.c
> +++ b/fs/userfaultfd.c
> @@ -405,6 +405,13 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)
>
> if (ctx->features & UFFD_FEATURE_SIGBUS)
> goto out;
> + if ((vmf->flags & FAULT_FLAG_USER) == 0 &&
> + ctx->flags & UFFD_USER_MODE_ONLY) {
> + printk_once(KERN_WARNING "uffd: Set unprivileged_userfaultfd "
> + "sysctl knob to 1 if kernel faults must be handled "
> + "without obtaining CAP_SYS_PTRACE capability\n");
> + goto out;
> + }
>
> /*
> * If it's already released don't get it. This avoids to loop
> @@ -1965,10 +1972,11 @@ SYSCALL_DEFINE1(userfaultfd, int, flags)
> BUG_ON(!current->mm);
>
> /* Check the UFFD_* constants for consistency. */
> + BUILD_BUG_ON(UFFD_USER_MODE_ONLY & UFFD_SHARED_FCNTL_FLAGS);
> BUILD_BUG_ON(UFFD_CLOEXEC != O_CLOEXEC);
> BUILD_BUG_ON(UFFD_NONBLOCK != O_NONBLOCK);
>
> - if (flags & ~UFFD_SHARED_FCNTL_FLAGS)
> + if (flags & ~(UFFD_SHARED_FCNTL_FLAGS | UFFD_USER_MODE_ONLY))
> return -EINVAL;
>
> ctx = kmem_cache_alloc(userfaultfd_ctx_cachep, GFP_KERNEL);
> diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h
> index e7e98bde221f..5f2d88212f7c 100644
> --- a/include/uapi/linux/userfaultfd.h
> +++ b/include/uapi/linux/userfaultfd.h
> @@ -257,4 +257,13 @@ struct uffdio_writeprotect {
> __u64 mode;
> };
>
> +/*
> + * Flags for the userfaultfd(2) system call itself.
> + */
> +
> +/*
> + * Create a userfaultfd that can handle page faults only in user mode.
> + */
> +#define UFFD_USER_MODE_ONLY 1
> +
> #endif /* _LINUX_USERFAULTFD_H */
> --
> 2.29.0.rc1.297.gfa9743e501-goog
>
Adding linux-mm@kvack.org mailing list
next prev parent reply other threads:[~2020-11-20 3:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 3:04 [PATCH v6 0/2] Control over userfaultfd kernel-fault handling Lokesh Gidra
2020-11-20 3:04 ` [PATCH v6 1/2] Add UFFD_USER_MODE_ONLY Lokesh Gidra
2020-11-20 3:09 ` Lokesh Gidra [this message]
2020-11-20 23:33 ` Andrew Morton
2020-11-23 19:17 ` Lokesh Gidra
2020-11-23 20:11 ` Andrew Morton
2020-11-20 3:04 ` [PATCH v6 2/2] Add user-mode only option to unprivileged_userfaultfd sysctl knob Lokesh Gidra
2020-11-20 3:10 ` Lokesh Gidra
2020-11-20 3:08 ` [PATCH v6 0/2] Control over userfaultfd kernel-fault handling Lokesh Gidra
-- strict thread matches above, loose matches on Subject: below --
2020-10-26 21:00 Lokesh Gidra
2020-10-26 21:00 ` [PATCH v6 1/2] Add UFFD_USER_MODE_ONLY Lokesh Gidra
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=CA+EESO6xfnRWD2xrmar6VrcWBA8P53J8gVZmOtR0Ri65yb-Q4w@mail.gmail.com \
--to=lokeshgidra@google.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bigeasy@linutronix.de \
--cc=calin@google.com \
--cc=corbet@lwn.net \
--cc=dancol@dancol.org \
--cc=ebiggers@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=jeffv@google.com \
--cc=jglisse@redhat.com \
--cc=joel@joelfernandes.org \
--cc=kaleshsingh@google.com \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcgrof@kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mgorman@techsingularity.net \
--cc=nigupta@nvidia.com \
--cc=peterx@redhat.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=shli@fb.com \
--cc=stephen.smalley.work@gmail.com \
--cc=surenb@google.com \
--cc=vbabka@suse.cz \
--cc=viro@zeniv.linux.org.uk \
--cc=yzaikin@google.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).