summaryrefslogtreecommitdiffstats
path: root/fs/userfaultfd.c
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2017-03-10 01:16:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-10 02:01:09 +0100
commit9a69a829f9b656c2a220d65a94ecf7b5887c5da1 (patch)
treedee2ed7716c4d6ce06f1e6762c6eb5f002b91f23 /fs/userfaultfd.c
parentuserfaultfd: non-cooperative: rollback userfaultfd_exit (diff)
downloadlinux-9a69a829f9b656c2a220d65a94ecf7b5887c5da1.tar.xz
linux-9a69a829f9b656c2a220d65a94ecf7b5887c5da1.zip
userfaultfd: non-cooperative: robustness check
Similar to the handle_userfault() case, also make sure to never attempt to send any event past the PF_EXITING point of no return. This is purely a robustness check. Link: http://lkml.kernel.org/r/20170224181957.19736-3-aarcange@redhat.com Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Pavel Emelyanov <xemul@parallels.com> Cc: Hillf Danton <hillf.zj@alibaba-inc.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--fs/userfaultfd.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 16d0cc600fa9..668bbbd2e04d 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -530,8 +530,13 @@ out:
static int userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
struct userfaultfd_wait_queue *ewq)
{
- int ret = 0;
+ int ret;
+
+ ret = -1;
+ if (WARN_ON_ONCE(current->flags & PF_EXITING))
+ goto out;
+ ret = 0;
ewq->ctx = ctx;
init_waitqueue_entry(&ewq->wq, current);
@@ -566,7 +571,7 @@ static int userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
* ctx may go away after this if the userfault pseudo fd is
* already released.
*/
-
+out:
userfaultfd_ctx_put(ctx);
return ret;
}