tree a8bce29dd08c8dcb3eb2ae13062c09b1f3e69931
parent e65797a93e38cd8390e06e25c894125801ca9eaa
author Lokesh Gidra <lokeshgidra@google.com> 1608002034 -0800
committer Tim Zimmermann <tim@linux4.de> 1721966658 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuwYxAyE4TRnuhLgPbcIaY/gZxe8FAmajIEIACgkQbcIaY/gZ
 xe8UAg//YCZOUDupGVYHsbGPqsBs/8JFCZp7Ma7D+CdGeaYsHefTEnjJMc15F+HU
 xawvMHKyNeGgBBFmp9loH5zN/mQdEO2UjcK9ryNmp2NULSejGiLZ3lrRguzSuZpP
 jXXSz7upUJkNHhZzP7FWMBAQWwVaSCoeDzdY9CDw7MbZK/z6ND87no2UuZ9MBNY2
 TzYcdMbdTYc9T1sltAIj09PsCdNVaOAHYNNEXBFmAu1ReyQqOB5fwbjGZ5s+HAaC
 3i25/0Qd1nCYZRUZPvMlxAaEmVXux8T7vb2p0XM1KVpOd4coFq9R8fVLDkYGIDFg
 e5GWf+uGT0PaTKU1dYlIE/PUEEud4kI2lyE18V1BM2PqYZKmkSyysMcvi/W8Ifp+
 iyljxvqpKEO/aVOjV+osqOdCA+uSsWfeOU8WbE5g/1Ecf1F7E/n7AzUgkRAciO4k
 eMy6yCuDjfAFbU4aXzu6n3B4/HlY+TlBWS1obYv3lhxI2ATPEb32TXlLMUnsVVzR
 ikZBAvk3qHEWLy1N9zZhMnIet7VQOgW61IKmpXRhTDEsDv1PlCvU2o3zeiV6ceLd
 37VZOVeR0f3IOOFXDziVKRTMrux3EaQI2vSpBedNDURDW1MJ2EjzQnGoRcVxKXML
 vE7oDfn+NFztrQSkfGZEK4BrX3HUCSZtKHTJCjVjE40IzquGMnk=
 =er9S
 -----END PGP SIGNATURE-----

UPSTREAM: userfaultfd: add user-mode only option to unprivileged_userfaultfd sysctl knob

With this change, when the knob is set to 0, it allows unprivileged users
to call userfaultfd, like when it is set to 1, but with the restriction
that page faults from only user-mode can be handled.  In this mode, an
unprivileged user (without SYS_CAP_PTRACE capability) must pass
UFFD_USER_MODE_ONLY to userfaultd or the API will fail with EPERM.

This enables administrators to reduce the likelihood that an attacker with
access to userfaultfd can delay faulting kernel code to widen timing
windows for other exploits.

The default value of this knob is changed to 0.  This is required for
correct functioning of pipe mutex.  However, this will fail postcopy live
migration, which will be unnoticeable to the VM guests.  To avoid this,
set 'vm.userfault = 1' in /sys/sysctl.conf.

The main reason this change is desirable as in the short term is that the
Android userland will behave as with the sysctl set to zero.  So without
this commit, any Linux binary using userfaultfd to manage its memory would
behave differently if run within the Android userland.  For more details,
refer to Andrea's reply [1].

[1] https://lore.kernel.org/lkml/20200904033438.GI9411@redhat.com/

Link: https://lkml.kernel.org/r/20201120030411.2690816-3-lokeshgidra@google.com
Signed-off-by: Lokesh Gidra <lokeshgidra@google.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Peter Xu <peterx@redhat.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Stephen Smalley <stephen.smalley.work@gmail.com>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: Daniel Colascione <dancol@dancol.org>
Cc: "Joel Fernandes (Google)" <joel@joelfernandes.org>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Jeff Vander Stoep <jeffv@google.com>
Cc: <calin@google.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Shaohua Li <shli@fb.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Nitin Gupta <nigupta@nvidia.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Daniel Colascione <dancol@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d0d4730ac2e404a5b0da9a87ef38c73e51cb1664)
Signed-off-by: Lokesh Gidra <lokeshgidra@google.com>
Bug: 160737021
Bug: 169683130
Change-Id: Ic46c0be47d6394d25bd3443ff524936fa568ab85