]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
userfaultfd: non-cooperative: robustness check
authorAndrea Arcangeli <aarcange@redhat.com>
Fri, 10 Mar 2017 00:16:52 +0000 (16:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Mar 2017 01:01:09 +0000 (17:01 -0800)
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>
fs/userfaultfd.c

index 16d0cc600fa9d51d308f4c87384eabcce8548af1..668bbbd2e04dc8379d5b43c1aea723941312a848 100644 (file)
@@ -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;
 }