| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
|---|
| 1 | 2 | /* |
|---|
| 2 | 3 | * fs/userfaultfd.c |
|---|
| 3 | 4 | * |
|---|
| 4 | 5 | * Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org> |
|---|
| 5 | 6 | * Copyright (C) 2008-2009 Red Hat, Inc. |
|---|
| 6 | 7 | * Copyright (C) 2015 Red Hat, Inc. |
|---|
| 7 | | - * |
|---|
| 8 | | - * This work is licensed under the terms of the GNU GPL, version 2. See |
|---|
| 9 | | - * the COPYING file in the top-level directory. |
|---|
| 10 | 8 | * |
|---|
| 11 | 9 | * Some part derived from fs/eventfd.c (anon inode setup) and |
|---|
| 12 | 10 | * mm/ksm.c (mm hashing). |
|---|
| .. | .. |
|---|
| 17 | 15 | #include <linux/sched/signal.h> |
|---|
| 18 | 16 | #include <linux/sched/mm.h> |
|---|
| 19 | 17 | #include <linux/mm.h> |
|---|
| 18 | +#include <linux/mmu_notifier.h> |
|---|
| 20 | 19 | #include <linux/poll.h> |
|---|
| 21 | 20 | #include <linux/slab.h> |
|---|
| 22 | 21 | #include <linux/seq_file.h> |
|---|
| .. | .. |
|---|
| 29 | 28 | #include <linux/ioctl.h> |
|---|
| 30 | 29 | #include <linux/security.h> |
|---|
| 31 | 30 | #include <linux/hugetlb.h> |
|---|
| 31 | + |
|---|
| 32 | +int sysctl_unprivileged_userfaultfd __read_mostly; |
|---|
| 32 | 33 | |
|---|
| 33 | 34 | static struct kmem_cache *userfaultfd_ctx_cachep __read_mostly; |
|---|
| 34 | 35 | |
|---|
| .. | .. |
|---|
| 56 | 57 | /* waitqueue head for events */ |
|---|
| 57 | 58 | wait_queue_head_t event_wqh; |
|---|
| 58 | 59 | /* a refile sequence protected by fault_pending_wqh lock */ |
|---|
| 59 | | - seqlock_t refile_seq; |
|---|
| 60 | + seqcount_spinlock_t refile_seq; |
|---|
| 60 | 61 | /* pseudo fd refcounting */ |
|---|
| 61 | | - atomic_t refcount; |
|---|
| 62 | + refcount_t refcount; |
|---|
| 62 | 63 | /* userfaultfd syscall flags */ |
|---|
| 63 | 64 | unsigned int flags; |
|---|
| 64 | 65 | /* features requested from the userspace */ |
|---|
| .. | .. |
|---|
| 151 | 152 | */ |
|---|
| 152 | 153 | static void userfaultfd_ctx_get(struct userfaultfd_ctx *ctx) |
|---|
| 153 | 154 | { |
|---|
| 154 | | - if (!atomic_inc_not_zero(&ctx->refcount)) |
|---|
| 155 | | - BUG(); |
|---|
| 155 | + refcount_inc(&ctx->refcount); |
|---|
| 156 | 156 | } |
|---|
| 157 | 157 | |
|---|
| 158 | 158 | /** |
|---|
| .. | .. |
|---|
| 165 | 165 | */ |
|---|
| 166 | 166 | static void userfaultfd_ctx_put(struct userfaultfd_ctx *ctx) |
|---|
| 167 | 167 | { |
|---|
| 168 | | - if (atomic_dec_and_test(&ctx->refcount)) { |
|---|
| 168 | + if (refcount_dec_and_test(&ctx->refcount)) { |
|---|
| 169 | 169 | VM_BUG_ON(spin_is_locked(&ctx->fault_pending_wqh.lock)); |
|---|
| 170 | 170 | VM_BUG_ON(waitqueue_active(&ctx->fault_pending_wqh)); |
|---|
| 171 | 171 | VM_BUG_ON(spin_is_locked(&ctx->fault_wqh.lock)); |
|---|
| .. | .. |
|---|
| 198 | 198 | msg_init(&msg); |
|---|
| 199 | 199 | msg.event = UFFD_EVENT_PAGEFAULT; |
|---|
| 200 | 200 | msg.arg.pagefault.address = address; |
|---|
| 201 | + /* |
|---|
| 202 | + * These flags indicate why the userfault occurred: |
|---|
| 203 | + * - UFFD_PAGEFAULT_FLAG_WP indicates a write protect fault. |
|---|
| 204 | + * - UFFD_PAGEFAULT_FLAG_MINOR indicates a minor fault. |
|---|
| 205 | + * - Neither of these flags being set indicates a MISSING fault. |
|---|
| 206 | + * |
|---|
| 207 | + * Separately, UFFD_PAGEFAULT_FLAG_WRITE indicates it was a write |
|---|
| 208 | + * fault. Otherwise, it was a read fault. |
|---|
| 209 | + */ |
|---|
| 201 | 210 | if (flags & FAULT_FLAG_WRITE) |
|---|
| 202 | | - /* |
|---|
| 203 | | - * If UFFD_FEATURE_PAGEFAULT_FLAG_WP was set in the |
|---|
| 204 | | - * uffdio_api.features and UFFD_PAGEFAULT_FLAG_WRITE |
|---|
| 205 | | - * was not set in a UFFD_EVENT_PAGEFAULT, it means it |
|---|
| 206 | | - * was a read fault, otherwise if set it means it's |
|---|
| 207 | | - * a write fault. |
|---|
| 208 | | - */ |
|---|
| 209 | 211 | msg.arg.pagefault.flags |= UFFD_PAGEFAULT_FLAG_WRITE; |
|---|
| 210 | 212 | if (reason & VM_UFFD_WP) |
|---|
| 211 | | - /* |
|---|
| 212 | | - * If UFFD_FEATURE_PAGEFAULT_FLAG_WP was set in the |
|---|
| 213 | | - * uffdio_api.features and UFFD_PAGEFAULT_FLAG_WP was |
|---|
| 214 | | - * not set in a UFFD_EVENT_PAGEFAULT, it means it was |
|---|
| 215 | | - * a missing fault, otherwise if set it means it's a |
|---|
| 216 | | - * write protect fault. |
|---|
| 217 | | - */ |
|---|
| 218 | 213 | msg.arg.pagefault.flags |= UFFD_PAGEFAULT_FLAG_WP; |
|---|
| 214 | + if (reason & VM_UFFD_MINOR) |
|---|
| 215 | + msg.arg.pagefault.flags |= UFFD_PAGEFAULT_FLAG_MINOR; |
|---|
| 219 | 216 | if (features & UFFD_FEATURE_THREAD_ID) |
|---|
| 220 | 217 | msg.arg.pagefault.feat.ptid = task_pid_vnr(current); |
|---|
| 221 | 218 | return msg; |
|---|
| .. | .. |
|---|
| 236 | 233 | pte_t *ptep, pte; |
|---|
| 237 | 234 | bool ret = true; |
|---|
| 238 | 235 | |
|---|
| 239 | | - VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem)); |
|---|
| 236 | + mmap_assert_locked(mm); |
|---|
| 240 | 237 | |
|---|
| 241 | 238 | ptep = huge_pte_offset(mm, address, vma_mmu_pagesize(vma)); |
|---|
| 242 | 239 | |
|---|
| .. | .. |
|---|
| 288 | 285 | pte_t *pte; |
|---|
| 289 | 286 | bool ret = true; |
|---|
| 290 | 287 | |
|---|
| 291 | | - VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem)); |
|---|
| 288 | + mmap_assert_locked(mm); |
|---|
| 292 | 289 | |
|---|
| 293 | 290 | pgd = pgd_offset(mm, address); |
|---|
| 294 | 291 | if (!pgd_present(*pgd)) |
|---|
| .. | .. |
|---|
| 316 | 313 | if (!pmd_present(_pmd)) |
|---|
| 317 | 314 | goto out; |
|---|
| 318 | 315 | |
|---|
| 319 | | - if (pmd_trans_huge(_pmd)) |
|---|
| 316 | + if (pmd_trans_huge(_pmd)) { |
|---|
| 317 | + if (!pmd_write(_pmd) && (reason & VM_UFFD_WP)) |
|---|
| 318 | + ret = true; |
|---|
| 320 | 319 | goto out; |
|---|
| 320 | + } |
|---|
| 321 | 321 | |
|---|
| 322 | 322 | /* |
|---|
| 323 | 323 | * the pmd is stable (as in !pmd_trans_unstable) so we can re-read it |
|---|
| .. | .. |
|---|
| 330 | 330 | */ |
|---|
| 331 | 331 | if (pte_none(*pte)) |
|---|
| 332 | 332 | ret = true; |
|---|
| 333 | + if (!pte_write(*pte) && (reason & VM_UFFD_WP)) |
|---|
| 334 | + ret = true; |
|---|
| 333 | 335 | pte_unmap(pte); |
|---|
| 334 | 336 | |
|---|
| 335 | 337 | out: |
|---|
| 336 | 338 | return ret; |
|---|
| 339 | +} |
|---|
| 340 | + |
|---|
| 341 | +static inline long userfaultfd_get_blocking_state(unsigned int flags) |
|---|
| 342 | +{ |
|---|
| 343 | + if (flags & FAULT_FLAG_INTERRUPTIBLE) |
|---|
| 344 | + return TASK_INTERRUPTIBLE; |
|---|
| 345 | + |
|---|
| 346 | + if (flags & FAULT_FLAG_KILLABLE) |
|---|
| 347 | + return TASK_KILLABLE; |
|---|
| 348 | + |
|---|
| 349 | + return TASK_UNINTERRUPTIBLE; |
|---|
| 337 | 350 | } |
|---|
| 338 | 351 | |
|---|
| 339 | 352 | /* |
|---|
| .. | .. |
|---|
| 342 | 355 | * FAULT_FLAG_KILLABLE are not straightforward. The "Caution" |
|---|
| 343 | 356 | * recommendation in __lock_page_or_retry is not an understatement. |
|---|
| 344 | 357 | * |
|---|
| 345 | | - * If FAULT_FLAG_ALLOW_RETRY is set, the mmap_sem must be released |
|---|
| 358 | + * If FAULT_FLAG_ALLOW_RETRY is set, the mmap_lock must be released |
|---|
| 346 | 359 | * before returning VM_FAULT_RETRY only if FAULT_FLAG_RETRY_NOWAIT is |
|---|
| 347 | 360 | * not set. |
|---|
| 348 | 361 | * |
|---|
| 349 | 362 | * If FAULT_FLAG_ALLOW_RETRY is set but FAULT_FLAG_KILLABLE is not |
|---|
| 350 | 363 | * set, VM_FAULT_RETRY can still be returned if and only if there are |
|---|
| 351 | | - * fatal_signal_pending()s, and the mmap_sem must be released before |
|---|
| 364 | + * fatal_signal_pending()s, and the mmap_lock must be released before |
|---|
| 352 | 365 | * returning it. |
|---|
| 353 | 366 | */ |
|---|
| 354 | 367 | vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) |
|---|
| .. | .. |
|---|
| 357 | 370 | struct userfaultfd_ctx *ctx; |
|---|
| 358 | 371 | struct userfaultfd_wait_queue uwq; |
|---|
| 359 | 372 | vm_fault_t ret = VM_FAULT_SIGBUS; |
|---|
| 360 | | - bool must_wait, return_to_userland; |
|---|
| 373 | + bool must_wait; |
|---|
| 361 | 374 | long blocking_state; |
|---|
| 362 | 375 | |
|---|
| 363 | 376 | /* |
|---|
| .. | .. |
|---|
| 369 | 382 | * FOLL_DUMP case, anon memory also checks for FOLL_DUMP with |
|---|
| 370 | 383 | * the no_page_table() helper in follow_page_mask(), but the |
|---|
| 371 | 384 | * shmem_vm_ops->fault method is invoked even during |
|---|
| 372 | | - * coredumping without mmap_sem and it ends up here. |
|---|
| 385 | + * coredumping without mmap_lock and it ends up here. |
|---|
| 373 | 386 | */ |
|---|
| 374 | 387 | if (current->flags & (PF_EXITING|PF_DUMPCORE)) |
|---|
| 375 | 388 | goto out; |
|---|
| 376 | 389 | |
|---|
| 377 | 390 | /* |
|---|
| 378 | | - * Coredumping runs without mmap_sem so we can only check that |
|---|
| 379 | | - * the mmap_sem is held, if PF_DUMPCORE was not set. |
|---|
| 391 | + * Coredumping runs without mmap_lock so we can only check that |
|---|
| 392 | + * the mmap_lock is held, if PF_DUMPCORE was not set. |
|---|
| 380 | 393 | */ |
|---|
| 381 | | - WARN_ON_ONCE(!rwsem_is_locked(&mm->mmap_sem)); |
|---|
| 394 | + mmap_assert_locked(mm); |
|---|
| 382 | 395 | |
|---|
| 383 | 396 | ctx = vmf->vma->vm_userfaultfd_ctx.ctx; |
|---|
| 384 | 397 | if (!ctx) |
|---|
| .. | .. |
|---|
| 386 | 399 | |
|---|
| 387 | 400 | BUG_ON(ctx->mm != mm); |
|---|
| 388 | 401 | |
|---|
| 389 | | - VM_BUG_ON(reason & ~(VM_UFFD_MISSING|VM_UFFD_WP)); |
|---|
| 390 | | - VM_BUG_ON(!(reason & VM_UFFD_MISSING) ^ !!(reason & VM_UFFD_WP)); |
|---|
| 402 | + /* Any unrecognized flag is a bug. */ |
|---|
| 403 | + VM_BUG_ON(reason & ~__VM_UFFD_FLAGS); |
|---|
| 404 | + /* 0 or > 1 flags set is a bug; we expect exactly 1. */ |
|---|
| 405 | + VM_BUG_ON(!reason || (reason & (reason - 1))); |
|---|
| 391 | 406 | |
|---|
| 392 | 407 | if (ctx->features & UFFD_FEATURE_SIGBUS) |
|---|
| 393 | 408 | goto out; |
|---|
| 409 | + if ((vmf->flags & FAULT_FLAG_USER) == 0 && |
|---|
| 410 | + ctx->flags & UFFD_USER_MODE_ONLY) { |
|---|
| 411 | + printk_once(KERN_WARNING "uffd: Set unprivileged_userfaultfd " |
|---|
| 412 | + "sysctl knob to 1 if kernel faults must be handled " |
|---|
| 413 | + "without obtaining CAP_SYS_PTRACE capability\n"); |
|---|
| 414 | + goto out; |
|---|
| 415 | + } |
|---|
| 394 | 416 | |
|---|
| 395 | 417 | /* |
|---|
| 396 | 418 | * If it's already released don't get it. This avoids to loop |
|---|
| 397 | 419 | * in __get_user_pages if userfaultfd_release waits on the |
|---|
| 398 | | - * caller of handle_userfault to release the mmap_sem. |
|---|
| 420 | + * caller of handle_userfault to release the mmap_lock. |
|---|
| 399 | 421 | */ |
|---|
| 400 | 422 | if (unlikely(READ_ONCE(ctx->released))) { |
|---|
| 401 | 423 | /* |
|---|
| .. | .. |
|---|
| 454 | 476 | if (vmf->flags & FAULT_FLAG_RETRY_NOWAIT) |
|---|
| 455 | 477 | goto out; |
|---|
| 456 | 478 | |
|---|
| 457 | | - /* take the reference before dropping the mmap_sem */ |
|---|
| 479 | + /* take the reference before dropping the mmap_lock */ |
|---|
| 458 | 480 | userfaultfd_ctx_get(ctx); |
|---|
| 459 | 481 | |
|---|
| 460 | 482 | init_waitqueue_func_entry(&uwq.wq, userfaultfd_wake_function); |
|---|
| .. | .. |
|---|
| 464 | 486 | uwq.ctx = ctx; |
|---|
| 465 | 487 | uwq.waken = false; |
|---|
| 466 | 488 | |
|---|
| 467 | | - return_to_userland = |
|---|
| 468 | | - (vmf->flags & (FAULT_FLAG_USER|FAULT_FLAG_KILLABLE)) == |
|---|
| 469 | | - (FAULT_FLAG_USER|FAULT_FLAG_KILLABLE); |
|---|
| 470 | | - blocking_state = return_to_userland ? TASK_INTERRUPTIBLE : |
|---|
| 471 | | - TASK_KILLABLE; |
|---|
| 489 | + blocking_state = userfaultfd_get_blocking_state(vmf->flags); |
|---|
| 472 | 490 | |
|---|
| 473 | 491 | spin_lock_irq(&ctx->fault_pending_wqh.lock); |
|---|
| 474 | 492 | /* |
|---|
| .. | .. |
|---|
| 491 | 509 | must_wait = userfaultfd_huge_must_wait(ctx, vmf->vma, |
|---|
| 492 | 510 | vmf->address, |
|---|
| 493 | 511 | vmf->flags, reason); |
|---|
| 494 | | - up_read(&mm->mmap_sem); |
|---|
| 512 | + mmap_read_unlock(mm); |
|---|
| 495 | 513 | |
|---|
| 496 | | - if (likely(must_wait && !READ_ONCE(ctx->released) && |
|---|
| 497 | | - (return_to_userland ? !signal_pending(current) : |
|---|
| 498 | | - !fatal_signal_pending(current)))) { |
|---|
| 514 | + if (likely(must_wait && !READ_ONCE(ctx->released))) { |
|---|
| 499 | 515 | wake_up_poll(&ctx->fd_wqh, EPOLLIN); |
|---|
| 500 | 516 | schedule(); |
|---|
| 501 | | - ret |= VM_FAULT_MAJOR; |
|---|
| 502 | | - |
|---|
| 503 | | - /* |
|---|
| 504 | | - * False wakeups can orginate even from rwsem before |
|---|
| 505 | | - * up_read() however userfaults will wait either for a |
|---|
| 506 | | - * targeted wakeup on the specific uwq waitqueue from |
|---|
| 507 | | - * wake_userfault() or for signals or for uffd |
|---|
| 508 | | - * release. |
|---|
| 509 | | - */ |
|---|
| 510 | | - while (!READ_ONCE(uwq.waken)) { |
|---|
| 511 | | - /* |
|---|
| 512 | | - * This needs the full smp_store_mb() |
|---|
| 513 | | - * guarantee as the state write must be |
|---|
| 514 | | - * visible to other CPUs before reading |
|---|
| 515 | | - * uwq.waken from other CPUs. |
|---|
| 516 | | - */ |
|---|
| 517 | | - set_current_state(blocking_state); |
|---|
| 518 | | - if (READ_ONCE(uwq.waken) || |
|---|
| 519 | | - READ_ONCE(ctx->released) || |
|---|
| 520 | | - (return_to_userland ? signal_pending(current) : |
|---|
| 521 | | - fatal_signal_pending(current))) |
|---|
| 522 | | - break; |
|---|
| 523 | | - schedule(); |
|---|
| 524 | | - } |
|---|
| 525 | 517 | } |
|---|
| 526 | 518 | |
|---|
| 527 | 519 | __set_current_state(TASK_RUNNING); |
|---|
| 528 | | - |
|---|
| 529 | | - if (return_to_userland) { |
|---|
| 530 | | - if (signal_pending(current) && |
|---|
| 531 | | - !fatal_signal_pending(current)) { |
|---|
| 532 | | - /* |
|---|
| 533 | | - * If we got a SIGSTOP or SIGCONT and this is |
|---|
| 534 | | - * a normal userland page fault, just let |
|---|
| 535 | | - * userland return so the signal will be |
|---|
| 536 | | - * handled and gdb debugging works. The page |
|---|
| 537 | | - * fault code immediately after we return from |
|---|
| 538 | | - * this function is going to release the |
|---|
| 539 | | - * mmap_sem and it's not depending on it |
|---|
| 540 | | - * (unlike gup would if we were not to return |
|---|
| 541 | | - * VM_FAULT_RETRY). |
|---|
| 542 | | - * |
|---|
| 543 | | - * If a fatal signal is pending we still take |
|---|
| 544 | | - * the streamlined VM_FAULT_RETRY failure path |
|---|
| 545 | | - * and there's no need to retake the mmap_sem |
|---|
| 546 | | - * in such case. |
|---|
| 547 | | - */ |
|---|
| 548 | | - down_read(&mm->mmap_sem); |
|---|
| 549 | | - ret = VM_FAULT_NOPAGE; |
|---|
| 550 | | - } |
|---|
| 551 | | - } |
|---|
| 552 | 520 | |
|---|
| 553 | 521 | /* |
|---|
| 554 | 522 | * Here we race with the list_del; list_add in |
|---|
| .. | .. |
|---|
| 640 | 608 | struct mm_struct *mm = release_new_ctx->mm; |
|---|
| 641 | 609 | |
|---|
| 642 | 610 | /* the various vma->vm_userfaultfd_ctx still points to it */ |
|---|
| 643 | | - down_write(&mm->mmap_sem); |
|---|
| 644 | | - /* no task can run (and in turn coredump) yet */ |
|---|
| 645 | | - VM_WARN_ON(!mmget_still_valid(mm)); |
|---|
| 611 | + mmap_write_lock(mm); |
|---|
| 646 | 612 | for (vma = mm->mmap; vma; vma = vma->vm_next) |
|---|
| 647 | 613 | if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx) { |
|---|
| 648 | 614 | vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; |
|---|
| 649 | | - vma->vm_flags &= ~(VM_UFFD_WP | VM_UFFD_MISSING); |
|---|
| 615 | + vma->vm_flags &= ~__VM_UFFD_FLAGS; |
|---|
| 650 | 616 | } |
|---|
| 651 | | - up_write(&mm->mmap_sem); |
|---|
| 617 | + mmap_write_unlock(mm); |
|---|
| 652 | 618 | |
|---|
| 653 | 619 | userfaultfd_ctx_put(release_new_ctx); |
|---|
| 654 | 620 | } |
|---|
| .. | .. |
|---|
| 677 | 643 | |
|---|
| 678 | 644 | octx = vma->vm_userfaultfd_ctx.ctx; |
|---|
| 679 | 645 | if (!octx || !(octx->features & UFFD_FEATURE_EVENT_FORK)) { |
|---|
| 646 | + vm_write_begin(vma); |
|---|
| 680 | 647 | vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; |
|---|
| 681 | | - vma->vm_flags &= ~(VM_UFFD_WP | VM_UFFD_MISSING); |
|---|
| 648 | + WRITE_ONCE(vma->vm_flags, |
|---|
| 649 | + vma->vm_flags & ~__VM_UFFD_FLAGS); |
|---|
| 650 | + vm_write_end(vma); |
|---|
| 682 | 651 | return 0; |
|---|
| 683 | 652 | } |
|---|
| 684 | 653 | |
|---|
| .. | .. |
|---|
| 699 | 668 | return -ENOMEM; |
|---|
| 700 | 669 | } |
|---|
| 701 | 670 | |
|---|
| 702 | | - atomic_set(&ctx->refcount, 1); |
|---|
| 671 | + refcount_set(&ctx->refcount, 1); |
|---|
| 703 | 672 | ctx->flags = octx->flags; |
|---|
| 704 | 673 | ctx->features = octx->features; |
|---|
| 705 | 674 | ctx->released = false; |
|---|
| .. | .. |
|---|
| 759 | 728 | } else { |
|---|
| 760 | 729 | /* Drop uffd context if remap feature not enabled */ |
|---|
| 761 | 730 | vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; |
|---|
| 762 | | - vma->vm_flags &= ~(VM_UFFD_WP | VM_UFFD_MISSING); |
|---|
| 731 | + vma->vm_flags &= ~__VM_UFFD_FLAGS; |
|---|
| 763 | 732 | } |
|---|
| 764 | 733 | } |
|---|
| 765 | 734 | |
|---|
| .. | .. |
|---|
| 801 | 770 | |
|---|
| 802 | 771 | userfaultfd_ctx_get(ctx); |
|---|
| 803 | 772 | WRITE_ONCE(ctx->mmap_changing, true); |
|---|
| 804 | | - up_read(&mm->mmap_sem); |
|---|
| 773 | + mmap_read_unlock(mm); |
|---|
| 805 | 774 | |
|---|
| 806 | 775 | msg_init(&ewq.msg); |
|---|
| 807 | 776 | |
|---|
| .. | .. |
|---|
| 881 | 850 | /* len == 0 means wake all */ |
|---|
| 882 | 851 | struct userfaultfd_wake_range range = { .len = 0, }; |
|---|
| 883 | 852 | unsigned long new_flags; |
|---|
| 884 | | - bool still_valid; |
|---|
| 885 | 853 | |
|---|
| 886 | 854 | WRITE_ONCE(ctx->released, true); |
|---|
| 887 | 855 | |
|---|
| .. | .. |
|---|
| 892 | 860 | * Flush page faults out of all CPUs. NOTE: all page faults |
|---|
| 893 | 861 | * must be retried without returning VM_FAULT_SIGBUS if |
|---|
| 894 | 862 | * userfaultfd_ctx_get() succeeds but vma->vma_userfault_ctx |
|---|
| 895 | | - * changes while handle_userfault released the mmap_sem. So |
|---|
| 863 | + * changes while handle_userfault released the mmap_lock. So |
|---|
| 896 | 864 | * it's critical that released is set to true (above), before |
|---|
| 897 | | - * taking the mmap_sem for writing. |
|---|
| 865 | + * taking the mmap_lock for writing. |
|---|
| 898 | 866 | */ |
|---|
| 899 | | - down_write(&mm->mmap_sem); |
|---|
| 900 | | - still_valid = mmget_still_valid(mm); |
|---|
| 867 | + mmap_write_lock(mm); |
|---|
| 901 | 868 | prev = NULL; |
|---|
| 902 | 869 | for (vma = mm->mmap; vma; vma = vma->vm_next) { |
|---|
| 903 | 870 | cond_resched(); |
|---|
| 904 | 871 | BUG_ON(!!vma->vm_userfaultfd_ctx.ctx ^ |
|---|
| 905 | | - !!(vma->vm_flags & (VM_UFFD_MISSING | VM_UFFD_WP))); |
|---|
| 872 | + !!(vma->vm_flags & __VM_UFFD_FLAGS)); |
|---|
| 906 | 873 | if (vma->vm_userfaultfd_ctx.ctx != ctx) { |
|---|
| 907 | 874 | prev = vma; |
|---|
| 908 | 875 | continue; |
|---|
| 909 | 876 | } |
|---|
| 910 | | - new_flags = vma->vm_flags & ~(VM_UFFD_MISSING | VM_UFFD_WP); |
|---|
| 911 | | - if (still_valid) { |
|---|
| 912 | | - prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end, |
|---|
| 913 | | - new_flags, vma->anon_vma, |
|---|
| 914 | | - vma->vm_file, vma->vm_pgoff, |
|---|
| 915 | | - vma_policy(vma), |
|---|
| 916 | | - NULL_VM_UFFD_CTX, |
|---|
| 917 | | - vma_get_anon_name(vma)); |
|---|
| 918 | | - if (prev) |
|---|
| 919 | | - vma = prev; |
|---|
| 920 | | - else |
|---|
| 921 | | - prev = vma; |
|---|
| 922 | | - } |
|---|
| 923 | | - vma->vm_flags = new_flags; |
|---|
| 877 | + new_flags = vma->vm_flags & ~__VM_UFFD_FLAGS; |
|---|
| 878 | + prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end, |
|---|
| 879 | + new_flags, vma->anon_vma, |
|---|
| 880 | + vma->vm_file, vma->vm_pgoff, |
|---|
| 881 | + vma_policy(vma), |
|---|
| 882 | + NULL_VM_UFFD_CTX, |
|---|
| 883 | + vma_get_anon_name(vma)); |
|---|
| 884 | + if (prev) |
|---|
| 885 | + vma = prev; |
|---|
| 886 | + else |
|---|
| 887 | + prev = vma; |
|---|
| 888 | + vm_write_begin(vma); |
|---|
| 889 | + WRITE_ONCE(vma->vm_flags, new_flags); |
|---|
| 924 | 890 | vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; |
|---|
| 891 | + vm_write_end(vma); |
|---|
| 925 | 892 | } |
|---|
| 926 | | - up_write(&mm->mmap_sem); |
|---|
| 893 | + mmap_write_unlock(mm); |
|---|
| 927 | 894 | mmput(mm); |
|---|
| 928 | 895 | wakeup: |
|---|
| 929 | 896 | /* |
|---|
| .. | .. |
|---|
| 951 | 918 | wait_queue_entry_t *wq; |
|---|
| 952 | 919 | struct userfaultfd_wait_queue *uwq; |
|---|
| 953 | 920 | |
|---|
| 954 | | - VM_BUG_ON(!spin_is_locked(&wqh->lock)); |
|---|
| 921 | + lockdep_assert_held(&wqh->lock); |
|---|
| 955 | 922 | |
|---|
| 956 | 923 | uwq = NULL; |
|---|
| 957 | 924 | if (!waitqueue_active(wqh)) |
|---|
| .. | .. |
|---|
| 1013 | 980 | |
|---|
| 1014 | 981 | static const struct file_operations userfaultfd_fops; |
|---|
| 1015 | 982 | |
|---|
| 1016 | | -static int resolve_userfault_fork(struct userfaultfd_ctx *ctx, |
|---|
| 1017 | | - struct userfaultfd_ctx *new, |
|---|
| 983 | +static int resolve_userfault_fork(struct userfaultfd_ctx *new, |
|---|
| 984 | + struct inode *inode, |
|---|
| 1018 | 985 | struct uffd_msg *msg) |
|---|
| 1019 | 986 | { |
|---|
| 1020 | 987 | int fd; |
|---|
| 1021 | 988 | |
|---|
| 1022 | | - fd = anon_inode_getfd("[userfaultfd]", &userfaultfd_fops, new, |
|---|
| 1023 | | - O_RDWR | (new->flags & UFFD_SHARED_FCNTL_FLAGS)); |
|---|
| 989 | + fd = anon_inode_getfd_secure("[userfaultfd]", &userfaultfd_fops, new, |
|---|
| 990 | + O_RDONLY | (new->flags & UFFD_SHARED_FCNTL_FLAGS), inode); |
|---|
| 1024 | 991 | if (fd < 0) |
|---|
| 1025 | 992 | return fd; |
|---|
| 1026 | 993 | |
|---|
| .. | .. |
|---|
| 1030 | 997 | } |
|---|
| 1031 | 998 | |
|---|
| 1032 | 999 | static ssize_t userfaultfd_ctx_read(struct userfaultfd_ctx *ctx, int no_wait, |
|---|
| 1033 | | - struct uffd_msg *msg) |
|---|
| 1000 | + struct uffd_msg *msg, struct inode *inode) |
|---|
| 1034 | 1001 | { |
|---|
| 1035 | 1002 | ssize_t ret; |
|---|
| 1036 | 1003 | DECLARE_WAITQUEUE(wait, current); |
|---|
| .. | .. |
|---|
| 1060 | 1027 | * waitqueue could become empty if this is the |
|---|
| 1061 | 1028 | * only userfault. |
|---|
| 1062 | 1029 | */ |
|---|
| 1063 | | - write_seqlock(&ctx->refile_seq); |
|---|
| 1030 | + write_seqcount_begin(&ctx->refile_seq); |
|---|
| 1064 | 1031 | |
|---|
| 1065 | 1032 | /* |
|---|
| 1066 | 1033 | * The fault_pending_wqh.lock prevents the uwq |
|---|
| .. | .. |
|---|
| 1086 | 1053 | list_del(&uwq->wq.entry); |
|---|
| 1087 | 1054 | add_wait_queue(&ctx->fault_wqh, &uwq->wq); |
|---|
| 1088 | 1055 | |
|---|
| 1089 | | - write_sequnlock(&ctx->refile_seq); |
|---|
| 1056 | + write_seqcount_end(&ctx->refile_seq); |
|---|
| 1090 | 1057 | |
|---|
| 1091 | 1058 | /* careful to always initialize msg if ret == 0 */ |
|---|
| 1092 | 1059 | *msg = uwq->msg; |
|---|
| .. | .. |
|---|
| 1141 | 1108 | spin_unlock_irq(&ctx->fd_wqh.lock); |
|---|
| 1142 | 1109 | |
|---|
| 1143 | 1110 | if (!ret && msg->event == UFFD_EVENT_FORK) { |
|---|
| 1144 | | - ret = resolve_userfault_fork(ctx, fork_nctx, msg); |
|---|
| 1111 | + ret = resolve_userfault_fork(fork_nctx, inode, msg); |
|---|
| 1145 | 1112 | spin_lock_irq(&ctx->event_wqh.lock); |
|---|
| 1146 | 1113 | if (!list_empty(&fork_event)) { |
|---|
| 1147 | 1114 | /* |
|---|
| .. | .. |
|---|
| 1201 | 1168 | ssize_t _ret, ret = 0; |
|---|
| 1202 | 1169 | struct uffd_msg msg; |
|---|
| 1203 | 1170 | int no_wait = file->f_flags & O_NONBLOCK; |
|---|
| 1171 | + struct inode *inode = file_inode(file); |
|---|
| 1204 | 1172 | |
|---|
| 1205 | 1173 | if (!userfaultfd_is_initialized(ctx)) |
|---|
| 1206 | 1174 | return -EINVAL; |
|---|
| .. | .. |
|---|
| 1208 | 1176 | for (;;) { |
|---|
| 1209 | 1177 | if (count < sizeof(msg)) |
|---|
| 1210 | 1178 | return ret ? ret : -EINVAL; |
|---|
| 1211 | | - _ret = userfaultfd_ctx_read(ctx, no_wait, &msg); |
|---|
| 1179 | + _ret = userfaultfd_ctx_read(ctx, no_wait, &msg, inode); |
|---|
| 1212 | 1180 | if (_ret < 0) |
|---|
| 1213 | 1181 | return ret ? ret : _ret; |
|---|
| 1214 | 1182 | if (copy_to_user((__u64 __user *) buf, &msg, sizeof(msg))) |
|---|
| .. | .. |
|---|
| 1246 | 1214 | /* |
|---|
| 1247 | 1215 | * To be sure waitqueue_active() is not reordered by the CPU |
|---|
| 1248 | 1216 | * before the pagetable update, use an explicit SMP memory |
|---|
| 1249 | | - * barrier here. PT lock release or up_read(mmap_sem) still |
|---|
| 1217 | + * barrier here. PT lock release or mmap_read_unlock(mm) still |
|---|
| 1250 | 1218 | * have release semantics that can allow the |
|---|
| 1251 | 1219 | * waitqueue_active() to be reordered before the pte update. |
|---|
| 1252 | 1220 | */ |
|---|
| .. | .. |
|---|
| 1259 | 1227 | * sure we've userfaults to wake. |
|---|
| 1260 | 1228 | */ |
|---|
| 1261 | 1229 | do { |
|---|
| 1262 | | - seq = read_seqbegin(&ctx->refile_seq); |
|---|
| 1230 | + seq = read_seqcount_begin(&ctx->refile_seq); |
|---|
| 1263 | 1231 | need_wakeup = waitqueue_active(&ctx->fault_pending_wqh) || |
|---|
| 1264 | 1232 | waitqueue_active(&ctx->fault_wqh); |
|---|
| 1265 | 1233 | cond_resched(); |
|---|
| 1266 | | - } while (read_seqretry(&ctx->refile_seq, seq)); |
|---|
| 1234 | + } while (read_seqcount_retry(&ctx->refile_seq, seq)); |
|---|
| 1267 | 1235 | if (need_wakeup) |
|---|
| 1268 | 1236 | __wake_userfault(ctx, range); |
|---|
| 1269 | 1237 | } |
|---|
| 1270 | 1238 | |
|---|
| 1271 | 1239 | static __always_inline int validate_range(struct mm_struct *mm, |
|---|
| 1272 | | - __u64 *start, __u64 len) |
|---|
| 1240 | + __u64 start, __u64 len) |
|---|
| 1273 | 1241 | { |
|---|
| 1274 | 1242 | __u64 task_size = mm->task_size; |
|---|
| 1275 | 1243 | |
|---|
| 1276 | | - *start = untagged_addr(*start); |
|---|
| 1277 | | - |
|---|
| 1278 | | - if (*start & ~PAGE_MASK) |
|---|
| 1244 | + if (start & ~PAGE_MASK) |
|---|
| 1279 | 1245 | return -EINVAL; |
|---|
| 1280 | 1246 | if (len & ~PAGE_MASK) |
|---|
| 1281 | 1247 | return -EINVAL; |
|---|
| 1282 | 1248 | if (!len) |
|---|
| 1283 | 1249 | return -EINVAL; |
|---|
| 1284 | | - if (*start < mmap_min_addr) |
|---|
| 1250 | + if (start < mmap_min_addr) |
|---|
| 1285 | 1251 | return -EINVAL; |
|---|
| 1286 | | - if (*start >= task_size) |
|---|
| 1252 | + if (start >= task_size) |
|---|
| 1287 | 1253 | return -EINVAL; |
|---|
| 1288 | | - if (len > task_size - *start) |
|---|
| 1254 | + if (len > task_size - start) |
|---|
| 1289 | 1255 | return -EINVAL; |
|---|
| 1290 | 1256 | return 0; |
|---|
| 1291 | 1257 | } |
|---|
| 1292 | 1258 | |
|---|
| 1293 | | -static inline bool vma_can_userfault(struct vm_area_struct *vma) |
|---|
| 1259 | +static inline bool vma_can_userfault(struct vm_area_struct *vma, |
|---|
| 1260 | + unsigned long vm_flags) |
|---|
| 1294 | 1261 | { |
|---|
| 1262 | + /* FIXME: add WP support to hugetlbfs and shmem */ |
|---|
| 1263 | + if (vm_flags & VM_UFFD_WP) { |
|---|
| 1264 | + if (is_vm_hugetlb_page(vma) || vma_is_shmem(vma)) |
|---|
| 1265 | + return false; |
|---|
| 1266 | + } |
|---|
| 1267 | + |
|---|
| 1268 | + if (vm_flags & VM_UFFD_MINOR) { |
|---|
| 1269 | + if (!(is_vm_hugetlb_page(vma) || vma_is_shmem(vma))) |
|---|
| 1270 | + return false; |
|---|
| 1271 | + } |
|---|
| 1272 | + |
|---|
| 1295 | 1273 | return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) || |
|---|
| 1296 | | - vma_is_shmem(vma); |
|---|
| 1274 | + vma_is_shmem(vma); |
|---|
| 1297 | 1275 | } |
|---|
| 1298 | 1276 | |
|---|
| 1299 | 1277 | static int userfaultfd_register(struct userfaultfd_ctx *ctx, |
|---|
| .. | .. |
|---|
| 1319 | 1297 | ret = -EINVAL; |
|---|
| 1320 | 1298 | if (!uffdio_register.mode) |
|---|
| 1321 | 1299 | goto out; |
|---|
| 1322 | | - if (uffdio_register.mode & ~(UFFDIO_REGISTER_MODE_MISSING| |
|---|
| 1323 | | - UFFDIO_REGISTER_MODE_WP)) |
|---|
| 1300 | + if (uffdio_register.mode & ~UFFD_API_REGISTER_MODES) |
|---|
| 1324 | 1301 | goto out; |
|---|
| 1325 | 1302 | vm_flags = 0; |
|---|
| 1326 | 1303 | if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MISSING) |
|---|
| 1327 | 1304 | vm_flags |= VM_UFFD_MISSING; |
|---|
| 1328 | | - if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP) { |
|---|
| 1305 | + if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP) |
|---|
| 1329 | 1306 | vm_flags |= VM_UFFD_WP; |
|---|
| 1330 | | - /* |
|---|
| 1331 | | - * FIXME: remove the below error constraint by |
|---|
| 1332 | | - * implementing the wprotect tracking mode. |
|---|
| 1333 | | - */ |
|---|
| 1334 | | - ret = -EINVAL; |
|---|
| 1307 | + if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MINOR) { |
|---|
| 1308 | +#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR |
|---|
| 1335 | 1309 | goto out; |
|---|
| 1310 | +#endif |
|---|
| 1311 | + vm_flags |= VM_UFFD_MINOR; |
|---|
| 1336 | 1312 | } |
|---|
| 1337 | 1313 | |
|---|
| 1338 | | - ret = validate_range(mm, &uffdio_register.range.start, |
|---|
| 1314 | + ret = validate_range(mm, uffdio_register.range.start, |
|---|
| 1339 | 1315 | uffdio_register.range.len); |
|---|
| 1340 | 1316 | if (ret) |
|---|
| 1341 | 1317 | goto out; |
|---|
| .. | .. |
|---|
| 1347 | 1323 | if (!mmget_not_zero(mm)) |
|---|
| 1348 | 1324 | goto out; |
|---|
| 1349 | 1325 | |
|---|
| 1350 | | - down_write(&mm->mmap_sem); |
|---|
| 1351 | | - if (!mmget_still_valid(mm)) |
|---|
| 1352 | | - goto out_unlock; |
|---|
| 1326 | + mmap_write_lock(mm); |
|---|
| 1353 | 1327 | vma = find_vma_prev(mm, start, &prev); |
|---|
| 1354 | 1328 | if (!vma) |
|---|
| 1355 | 1329 | goto out_unlock; |
|---|
| .. | .. |
|---|
| 1379 | 1353 | cond_resched(); |
|---|
| 1380 | 1354 | |
|---|
| 1381 | 1355 | BUG_ON(!!cur->vm_userfaultfd_ctx.ctx ^ |
|---|
| 1382 | | - !!(cur->vm_flags & (VM_UFFD_MISSING | VM_UFFD_WP))); |
|---|
| 1356 | + !!(cur->vm_flags & __VM_UFFD_FLAGS)); |
|---|
| 1383 | 1357 | |
|---|
| 1384 | 1358 | /* check not compatible vmas */ |
|---|
| 1385 | 1359 | ret = -EINVAL; |
|---|
| 1386 | | - if (!vma_can_userfault(cur)) |
|---|
| 1360 | + if (!vma_can_userfault(cur, vm_flags)) |
|---|
| 1387 | 1361 | goto out_unlock; |
|---|
| 1388 | 1362 | |
|---|
| 1389 | 1363 | /* |
|---|
| .. | .. |
|---|
| 1411 | 1385 | if (end & (vma_hpagesize - 1)) |
|---|
| 1412 | 1386 | goto out_unlock; |
|---|
| 1413 | 1387 | } |
|---|
| 1388 | + if ((vm_flags & VM_UFFD_WP) && !(cur->vm_flags & VM_MAYWRITE)) |
|---|
| 1389 | + goto out_unlock; |
|---|
| 1414 | 1390 | |
|---|
| 1415 | 1391 | /* |
|---|
| 1416 | 1392 | * Check that this vma isn't already owned by a |
|---|
| .. | .. |
|---|
| 1440 | 1416 | do { |
|---|
| 1441 | 1417 | cond_resched(); |
|---|
| 1442 | 1418 | |
|---|
| 1443 | | - BUG_ON(!vma_can_userfault(vma)); |
|---|
| 1419 | + BUG_ON(!vma_can_userfault(vma, vm_flags)); |
|---|
| 1444 | 1420 | BUG_ON(vma->vm_userfaultfd_ctx.ctx && |
|---|
| 1445 | 1421 | vma->vm_userfaultfd_ctx.ctx != ctx); |
|---|
| 1446 | 1422 | WARN_ON(!(vma->vm_flags & VM_MAYWRITE)); |
|---|
| .. | .. |
|---|
| 1457 | 1433 | start = vma->vm_start; |
|---|
| 1458 | 1434 | vma_end = min(end, vma->vm_end); |
|---|
| 1459 | 1435 | |
|---|
| 1460 | | - new_flags = (vma->vm_flags & ~vm_flags) | vm_flags; |
|---|
| 1436 | + new_flags = (vma->vm_flags & ~__VM_UFFD_FLAGS) | vm_flags; |
|---|
| 1461 | 1437 | prev = vma_merge(mm, prev, start, vma_end, new_flags, |
|---|
| 1462 | 1438 | vma->anon_vma, vma->vm_file, vma->vm_pgoff, |
|---|
| 1463 | 1439 | vma_policy(vma), |
|---|
| .. | .. |
|---|
| 1483 | 1459 | * the next vma was merged into the current one and |
|---|
| 1484 | 1460 | * the current one has not been updated yet. |
|---|
| 1485 | 1461 | */ |
|---|
| 1486 | | - vma->vm_flags = new_flags; |
|---|
| 1462 | + vm_write_begin(vma); |
|---|
| 1463 | + WRITE_ONCE(vma->vm_flags, new_flags); |
|---|
| 1487 | 1464 | vma->vm_userfaultfd_ctx.ctx = ctx; |
|---|
| 1465 | + vm_write_end(vma); |
|---|
| 1466 | + |
|---|
| 1467 | + if (is_vm_hugetlb_page(vma) && uffd_disable_huge_pmd_share(vma)) |
|---|
| 1468 | + hugetlb_unshare_all_pmds(vma); |
|---|
| 1488 | 1469 | |
|---|
| 1489 | 1470 | skip: |
|---|
| 1490 | 1471 | prev = vma; |
|---|
| .. | .. |
|---|
| 1492 | 1473 | vma = vma->vm_next; |
|---|
| 1493 | 1474 | } while (vma && vma->vm_start < end); |
|---|
| 1494 | 1475 | out_unlock: |
|---|
| 1495 | | - up_write(&mm->mmap_sem); |
|---|
| 1476 | + mmap_write_unlock(mm); |
|---|
| 1496 | 1477 | mmput(mm); |
|---|
| 1497 | 1478 | if (!ret) { |
|---|
| 1479 | + __u64 ioctls_out; |
|---|
| 1480 | + |
|---|
| 1481 | + ioctls_out = basic_ioctls ? UFFD_API_RANGE_IOCTLS_BASIC : |
|---|
| 1482 | + UFFD_API_RANGE_IOCTLS; |
|---|
| 1483 | + |
|---|
| 1484 | + /* |
|---|
| 1485 | + * Declare the WP ioctl only if the WP mode is |
|---|
| 1486 | + * specified and all checks passed with the range |
|---|
| 1487 | + */ |
|---|
| 1488 | + if (!(uffdio_register.mode & UFFDIO_REGISTER_MODE_WP)) |
|---|
| 1489 | + ioctls_out &= ~((__u64)1 << _UFFDIO_WRITEPROTECT); |
|---|
| 1490 | + |
|---|
| 1491 | + /* CONTINUE ioctl is only supported for MINOR ranges. */ |
|---|
| 1492 | + if (!(uffdio_register.mode & UFFDIO_REGISTER_MODE_MINOR)) |
|---|
| 1493 | + ioctls_out &= ~((__u64)1 << _UFFDIO_CONTINUE); |
|---|
| 1494 | + |
|---|
| 1498 | 1495 | /* |
|---|
| 1499 | 1496 | * Now that we scanned all vmas we can already tell |
|---|
| 1500 | 1497 | * userland which ioctls methods are guaranteed to |
|---|
| 1501 | 1498 | * succeed on this range. |
|---|
| 1502 | 1499 | */ |
|---|
| 1503 | | - if (put_user(basic_ioctls ? UFFD_API_RANGE_IOCTLS_BASIC : |
|---|
| 1504 | | - UFFD_API_RANGE_IOCTLS, |
|---|
| 1505 | | - &user_uffdio_register->ioctls)) |
|---|
| 1500 | + if (put_user(ioctls_out, &user_uffdio_register->ioctls)) |
|---|
| 1506 | 1501 | ret = -EFAULT; |
|---|
| 1507 | 1502 | } |
|---|
| 1508 | 1503 | out: |
|---|
| .. | .. |
|---|
| 1525 | 1520 | if (copy_from_user(&uffdio_unregister, buf, sizeof(uffdio_unregister))) |
|---|
| 1526 | 1521 | goto out; |
|---|
| 1527 | 1522 | |
|---|
| 1528 | | - ret = validate_range(mm, &uffdio_unregister.start, |
|---|
| 1523 | + ret = validate_range(mm, uffdio_unregister.start, |
|---|
| 1529 | 1524 | uffdio_unregister.len); |
|---|
| 1530 | 1525 | if (ret) |
|---|
| 1531 | 1526 | goto out; |
|---|
| .. | .. |
|---|
| 1537 | 1532 | if (!mmget_not_zero(mm)) |
|---|
| 1538 | 1533 | goto out; |
|---|
| 1539 | 1534 | |
|---|
| 1540 | | - down_write(&mm->mmap_sem); |
|---|
| 1541 | | - if (!mmget_still_valid(mm)) |
|---|
| 1542 | | - goto out_unlock; |
|---|
| 1535 | + mmap_write_lock(mm); |
|---|
| 1543 | 1536 | vma = find_vma_prev(mm, start, &prev); |
|---|
| 1544 | 1537 | if (!vma) |
|---|
| 1545 | 1538 | goto out_unlock; |
|---|
| .. | .. |
|---|
| 1569 | 1562 | cond_resched(); |
|---|
| 1570 | 1563 | |
|---|
| 1571 | 1564 | BUG_ON(!!cur->vm_userfaultfd_ctx.ctx ^ |
|---|
| 1572 | | - !!(cur->vm_flags & (VM_UFFD_MISSING | VM_UFFD_WP))); |
|---|
| 1565 | + !!(cur->vm_flags & __VM_UFFD_FLAGS)); |
|---|
| 1573 | 1566 | |
|---|
| 1574 | 1567 | /* |
|---|
| 1575 | 1568 | * Check not compatible vmas, not strictly required |
|---|
| .. | .. |
|---|
| 1578 | 1571 | * provides for more strict behavior to notice |
|---|
| 1579 | 1572 | * unregistration errors. |
|---|
| 1580 | 1573 | */ |
|---|
| 1581 | | - if (!vma_can_userfault(cur)) |
|---|
| 1574 | + if (!vma_can_userfault(cur, cur->vm_flags)) |
|---|
| 1582 | 1575 | goto out_unlock; |
|---|
| 1583 | 1576 | |
|---|
| 1584 | 1577 | found = true; |
|---|
| .. | .. |
|---|
| 1592 | 1585 | do { |
|---|
| 1593 | 1586 | cond_resched(); |
|---|
| 1594 | 1587 | |
|---|
| 1595 | | - BUG_ON(!vma_can_userfault(vma)); |
|---|
| 1588 | + BUG_ON(!vma_can_userfault(vma, vma->vm_flags)); |
|---|
| 1596 | 1589 | |
|---|
| 1597 | 1590 | /* |
|---|
| 1598 | 1591 | * Nothing to do: this vma is already registered into this |
|---|
| .. | .. |
|---|
| 1620 | 1613 | wake_userfault(vma->vm_userfaultfd_ctx.ctx, &range); |
|---|
| 1621 | 1614 | } |
|---|
| 1622 | 1615 | |
|---|
| 1623 | | - new_flags = vma->vm_flags & ~(VM_UFFD_MISSING | VM_UFFD_WP); |
|---|
| 1616 | + new_flags = vma->vm_flags & ~__VM_UFFD_FLAGS; |
|---|
| 1624 | 1617 | prev = vma_merge(mm, prev, start, vma_end, new_flags, |
|---|
| 1625 | 1618 | vma->anon_vma, vma->vm_file, vma->vm_pgoff, |
|---|
| 1626 | 1619 | vma_policy(vma), |
|---|
| .. | .. |
|---|
| 1646 | 1639 | * the next vma was merged into the current one and |
|---|
| 1647 | 1640 | * the current one has not been updated yet. |
|---|
| 1648 | 1641 | */ |
|---|
| 1649 | | - vma->vm_flags = new_flags; |
|---|
| 1642 | + vm_write_begin(vma); |
|---|
| 1643 | + WRITE_ONCE(vma->vm_flags, new_flags); |
|---|
| 1650 | 1644 | vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; |
|---|
| 1645 | + vm_write_end(vma); |
|---|
| 1651 | 1646 | |
|---|
| 1652 | 1647 | skip: |
|---|
| 1653 | 1648 | prev = vma; |
|---|
| .. | .. |
|---|
| 1655 | 1650 | vma = vma->vm_next; |
|---|
| 1656 | 1651 | } while (vma && vma->vm_start < end); |
|---|
| 1657 | 1652 | out_unlock: |
|---|
| 1658 | | - up_write(&mm->mmap_sem); |
|---|
| 1653 | + mmap_write_unlock(mm); |
|---|
| 1659 | 1654 | mmput(mm); |
|---|
| 1660 | 1655 | out: |
|---|
| 1661 | 1656 | return ret; |
|---|
| .. | .. |
|---|
| 1677 | 1672 | if (copy_from_user(&uffdio_wake, buf, sizeof(uffdio_wake))) |
|---|
| 1678 | 1673 | goto out; |
|---|
| 1679 | 1674 | |
|---|
| 1680 | | - ret = validate_range(ctx->mm, &uffdio_wake.start, uffdio_wake.len); |
|---|
| 1675 | + ret = validate_range(ctx->mm, uffdio_wake.start, uffdio_wake.len); |
|---|
| 1681 | 1676 | if (ret) |
|---|
| 1682 | 1677 | goto out; |
|---|
| 1683 | 1678 | |
|---|
| .. | .. |
|---|
| 1717 | 1712 | sizeof(uffdio_copy)-sizeof(__s64))) |
|---|
| 1718 | 1713 | goto out; |
|---|
| 1719 | 1714 | |
|---|
| 1720 | | - ret = validate_range(ctx->mm, &uffdio_copy.dst, uffdio_copy.len); |
|---|
| 1715 | + ret = validate_range(ctx->mm, uffdio_copy.dst, uffdio_copy.len); |
|---|
| 1721 | 1716 | if (ret) |
|---|
| 1722 | 1717 | goto out; |
|---|
| 1723 | 1718 | /* |
|---|
| .. | .. |
|---|
| 1728 | 1723 | ret = -EINVAL; |
|---|
| 1729 | 1724 | if (uffdio_copy.src + uffdio_copy.len <= uffdio_copy.src) |
|---|
| 1730 | 1725 | goto out; |
|---|
| 1731 | | - if (uffdio_copy.mode & ~UFFDIO_COPY_MODE_DONTWAKE) |
|---|
| 1726 | + if (uffdio_copy.mode & ~(UFFDIO_COPY_MODE_DONTWAKE|UFFDIO_COPY_MODE_WP)) |
|---|
| 1732 | 1727 | goto out; |
|---|
| 1733 | 1728 | if (mmget_not_zero(ctx->mm)) { |
|---|
| 1734 | 1729 | ret = mcopy_atomic(ctx->mm, uffdio_copy.dst, uffdio_copy.src, |
|---|
| 1735 | | - uffdio_copy.len, &ctx->mmap_changing); |
|---|
| 1730 | + uffdio_copy.len, &ctx->mmap_changing, |
|---|
| 1731 | + uffdio_copy.mode); |
|---|
| 1736 | 1732 | mmput(ctx->mm); |
|---|
| 1737 | 1733 | } else { |
|---|
| 1738 | 1734 | return -ESRCH; |
|---|
| .. | .. |
|---|
| 1773 | 1769 | sizeof(uffdio_zeropage)-sizeof(__s64))) |
|---|
| 1774 | 1770 | goto out; |
|---|
| 1775 | 1771 | |
|---|
| 1776 | | - ret = validate_range(ctx->mm, &uffdio_zeropage.range.start, |
|---|
| 1772 | + ret = validate_range(ctx->mm, uffdio_zeropage.range.start, |
|---|
| 1777 | 1773 | uffdio_zeropage.range.len); |
|---|
| 1778 | 1774 | if (ret) |
|---|
| 1779 | 1775 | goto out; |
|---|
| .. | .. |
|---|
| 1801 | 1797 | wake_userfault(ctx, &range); |
|---|
| 1802 | 1798 | } |
|---|
| 1803 | 1799 | ret = range.len == uffdio_zeropage.range.len ? 0 : -EAGAIN; |
|---|
| 1800 | +out: |
|---|
| 1801 | + return ret; |
|---|
| 1802 | +} |
|---|
| 1803 | + |
|---|
| 1804 | +static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx, |
|---|
| 1805 | + unsigned long arg) |
|---|
| 1806 | +{ |
|---|
| 1807 | + int ret; |
|---|
| 1808 | + struct uffdio_writeprotect uffdio_wp; |
|---|
| 1809 | + struct uffdio_writeprotect __user *user_uffdio_wp; |
|---|
| 1810 | + struct userfaultfd_wake_range range; |
|---|
| 1811 | + bool mode_wp, mode_dontwake; |
|---|
| 1812 | + |
|---|
| 1813 | + if (READ_ONCE(ctx->mmap_changing)) |
|---|
| 1814 | + return -EAGAIN; |
|---|
| 1815 | + |
|---|
| 1816 | + user_uffdio_wp = (struct uffdio_writeprotect __user *) arg; |
|---|
| 1817 | + |
|---|
| 1818 | + if (copy_from_user(&uffdio_wp, user_uffdio_wp, |
|---|
| 1819 | + sizeof(struct uffdio_writeprotect))) |
|---|
| 1820 | + return -EFAULT; |
|---|
| 1821 | + |
|---|
| 1822 | + ret = validate_range(ctx->mm, uffdio_wp.range.start, |
|---|
| 1823 | + uffdio_wp.range.len); |
|---|
| 1824 | + if (ret) |
|---|
| 1825 | + return ret; |
|---|
| 1826 | + |
|---|
| 1827 | + if (uffdio_wp.mode & ~(UFFDIO_WRITEPROTECT_MODE_DONTWAKE | |
|---|
| 1828 | + UFFDIO_WRITEPROTECT_MODE_WP)) |
|---|
| 1829 | + return -EINVAL; |
|---|
| 1830 | + |
|---|
| 1831 | + mode_wp = uffdio_wp.mode & UFFDIO_WRITEPROTECT_MODE_WP; |
|---|
| 1832 | + mode_dontwake = uffdio_wp.mode & UFFDIO_WRITEPROTECT_MODE_DONTWAKE; |
|---|
| 1833 | + |
|---|
| 1834 | + if (mode_wp && mode_dontwake) |
|---|
| 1835 | + return -EINVAL; |
|---|
| 1836 | + |
|---|
| 1837 | + if (mmget_not_zero(ctx->mm)) { |
|---|
| 1838 | + ret = mwriteprotect_range(ctx->mm, uffdio_wp.range.start, |
|---|
| 1839 | + uffdio_wp.range.len, mode_wp, |
|---|
| 1840 | + &ctx->mmap_changing); |
|---|
| 1841 | + mmput(ctx->mm); |
|---|
| 1842 | + } else { |
|---|
| 1843 | + return -ESRCH; |
|---|
| 1844 | + } |
|---|
| 1845 | + |
|---|
| 1846 | + if (ret) |
|---|
| 1847 | + return ret; |
|---|
| 1848 | + |
|---|
| 1849 | + if (!mode_wp && !mode_dontwake) { |
|---|
| 1850 | + range.start = uffdio_wp.range.start; |
|---|
| 1851 | + range.len = uffdio_wp.range.len; |
|---|
| 1852 | + wake_userfault(ctx, &range); |
|---|
| 1853 | + } |
|---|
| 1854 | + return ret; |
|---|
| 1855 | +} |
|---|
| 1856 | + |
|---|
| 1857 | +static int userfaultfd_continue(struct userfaultfd_ctx *ctx, unsigned long arg) |
|---|
| 1858 | +{ |
|---|
| 1859 | + __s64 ret; |
|---|
| 1860 | + struct uffdio_continue uffdio_continue; |
|---|
| 1861 | + struct uffdio_continue __user *user_uffdio_continue; |
|---|
| 1862 | + struct userfaultfd_wake_range range; |
|---|
| 1863 | + |
|---|
| 1864 | + user_uffdio_continue = (struct uffdio_continue __user *)arg; |
|---|
| 1865 | + |
|---|
| 1866 | + ret = -EAGAIN; |
|---|
| 1867 | + if (READ_ONCE(ctx->mmap_changing)) |
|---|
| 1868 | + goto out; |
|---|
| 1869 | + |
|---|
| 1870 | + ret = -EFAULT; |
|---|
| 1871 | + if (copy_from_user(&uffdio_continue, user_uffdio_continue, |
|---|
| 1872 | + /* don't copy the output fields */ |
|---|
| 1873 | + sizeof(uffdio_continue) - (sizeof(__s64)))) |
|---|
| 1874 | + goto out; |
|---|
| 1875 | + |
|---|
| 1876 | + ret = validate_range(ctx->mm, uffdio_continue.range.start, |
|---|
| 1877 | + uffdio_continue.range.len); |
|---|
| 1878 | + if (ret) |
|---|
| 1879 | + goto out; |
|---|
| 1880 | + |
|---|
| 1881 | + ret = -EINVAL; |
|---|
| 1882 | + /* double check for wraparound just in case. */ |
|---|
| 1883 | + if (uffdio_continue.range.start + uffdio_continue.range.len <= |
|---|
| 1884 | + uffdio_continue.range.start) { |
|---|
| 1885 | + goto out; |
|---|
| 1886 | + } |
|---|
| 1887 | + if (uffdio_continue.mode & ~UFFDIO_CONTINUE_MODE_DONTWAKE) |
|---|
| 1888 | + goto out; |
|---|
| 1889 | + |
|---|
| 1890 | + if (mmget_not_zero(ctx->mm)) { |
|---|
| 1891 | + ret = mcopy_continue(ctx->mm, uffdio_continue.range.start, |
|---|
| 1892 | + uffdio_continue.range.len, |
|---|
| 1893 | + &ctx->mmap_changing); |
|---|
| 1894 | + mmput(ctx->mm); |
|---|
| 1895 | + } else { |
|---|
| 1896 | + return -ESRCH; |
|---|
| 1897 | + } |
|---|
| 1898 | + |
|---|
| 1899 | + if (unlikely(put_user(ret, &user_uffdio_continue->mapped))) |
|---|
| 1900 | + return -EFAULT; |
|---|
| 1901 | + if (ret < 0) |
|---|
| 1902 | + goto out; |
|---|
| 1903 | + |
|---|
| 1904 | + /* len == 0 would wake all */ |
|---|
| 1905 | + BUG_ON(!ret); |
|---|
| 1906 | + range.len = ret; |
|---|
| 1907 | + if (!(uffdio_continue.mode & UFFDIO_CONTINUE_MODE_DONTWAKE)) { |
|---|
| 1908 | + range.start = uffdio_continue.range.start; |
|---|
| 1909 | + wake_userfault(ctx, &range); |
|---|
| 1910 | + } |
|---|
| 1911 | + ret = range.len == uffdio_continue.range.len ? 0 : -EAGAIN; |
|---|
| 1912 | + |
|---|
| 1804 | 1913 | out: |
|---|
| 1805 | 1914 | return ret; |
|---|
| 1806 | 1915 | } |
|---|
| .. | .. |
|---|
| 1840 | 1949 | goto err_out; |
|---|
| 1841 | 1950 | /* report all available features and ioctls to userland */ |
|---|
| 1842 | 1951 | uffdio_api.features = UFFD_API_FEATURES; |
|---|
| 1952 | +#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR |
|---|
| 1953 | + uffdio_api.features &= |
|---|
| 1954 | + ~(UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM); |
|---|
| 1955 | +#endif |
|---|
| 1843 | 1956 | uffdio_api.ioctls = UFFD_API_IOCTLS; |
|---|
| 1844 | 1957 | ret = -EFAULT; |
|---|
| 1845 | 1958 | if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api))) |
|---|
| .. | .. |
|---|
| 1889 | 2002 | case UFFDIO_ZEROPAGE: |
|---|
| 1890 | 2003 | ret = userfaultfd_zeropage(ctx, arg); |
|---|
| 1891 | 2004 | break; |
|---|
| 2005 | + case UFFDIO_WRITEPROTECT: |
|---|
| 2006 | + ret = userfaultfd_writeprotect(ctx, arg); |
|---|
| 2007 | + break; |
|---|
| 2008 | + case UFFDIO_CONTINUE: |
|---|
| 2009 | + ret = userfaultfd_continue(ctx, arg); |
|---|
| 2010 | + break; |
|---|
| 1892 | 2011 | } |
|---|
| 1893 | 2012 | return ret; |
|---|
| 1894 | 2013 | } |
|---|
| .. | .. |
|---|
| 1929 | 2048 | .poll = userfaultfd_poll, |
|---|
| 1930 | 2049 | .read = userfaultfd_read, |
|---|
| 1931 | 2050 | .unlocked_ioctl = userfaultfd_ioctl, |
|---|
| 1932 | | - .compat_ioctl = userfaultfd_ioctl, |
|---|
| 2051 | + .compat_ioctl = compat_ptr_ioctl, |
|---|
| 1933 | 2052 | .llseek = noop_llseek, |
|---|
| 1934 | 2053 | }; |
|---|
| 1935 | 2054 | |
|---|
| .. | .. |
|---|
| 1941 | 2060 | init_waitqueue_head(&ctx->fault_wqh); |
|---|
| 1942 | 2061 | init_waitqueue_head(&ctx->event_wqh); |
|---|
| 1943 | 2062 | init_waitqueue_head(&ctx->fd_wqh); |
|---|
| 1944 | | - seqlock_init(&ctx->refile_seq); |
|---|
| 2063 | + seqcount_spinlock_init(&ctx->refile_seq, &ctx->fault_pending_wqh.lock); |
|---|
| 1945 | 2064 | } |
|---|
| 1946 | 2065 | |
|---|
| 1947 | 2066 | SYSCALL_DEFINE1(userfaultfd, int, flags) |
|---|
| .. | .. |
|---|
| 1949 | 2068 | struct userfaultfd_ctx *ctx; |
|---|
| 1950 | 2069 | int fd; |
|---|
| 1951 | 2070 | |
|---|
| 2071 | + if (!sysctl_unprivileged_userfaultfd && |
|---|
| 2072 | + (flags & UFFD_USER_MODE_ONLY) == 0 && |
|---|
| 2073 | + !capable(CAP_SYS_PTRACE)) { |
|---|
| 2074 | + printk_once(KERN_WARNING "uffd: Set unprivileged_userfaultfd " |
|---|
| 2075 | + "sysctl knob to 1 if kernel faults must be handled " |
|---|
| 2076 | + "without obtaining CAP_SYS_PTRACE capability\n"); |
|---|
| 2077 | + return -EPERM; |
|---|
| 2078 | + } |
|---|
| 2079 | + |
|---|
| 1952 | 2080 | BUG_ON(!current->mm); |
|---|
| 1953 | 2081 | |
|---|
| 1954 | 2082 | /* Check the UFFD_* constants for consistency. */ |
|---|
| 2083 | + BUILD_BUG_ON(UFFD_USER_MODE_ONLY & UFFD_SHARED_FCNTL_FLAGS); |
|---|
| 1955 | 2084 | BUILD_BUG_ON(UFFD_CLOEXEC != O_CLOEXEC); |
|---|
| 1956 | 2085 | BUILD_BUG_ON(UFFD_NONBLOCK != O_NONBLOCK); |
|---|
| 1957 | 2086 | |
|---|
| 1958 | | - if (flags & ~UFFD_SHARED_FCNTL_FLAGS) |
|---|
| 2087 | + if (flags & ~(UFFD_SHARED_FCNTL_FLAGS | UFFD_USER_MODE_ONLY)) |
|---|
| 1959 | 2088 | return -EINVAL; |
|---|
| 1960 | 2089 | |
|---|
| 1961 | 2090 | ctx = kmem_cache_alloc(userfaultfd_ctx_cachep, GFP_KERNEL); |
|---|
| 1962 | 2091 | if (!ctx) |
|---|
| 1963 | 2092 | return -ENOMEM; |
|---|
| 1964 | 2093 | |
|---|
| 1965 | | - atomic_set(&ctx->refcount, 1); |
|---|
| 2094 | + refcount_set(&ctx->refcount, 1); |
|---|
| 1966 | 2095 | ctx->flags = flags; |
|---|
| 1967 | 2096 | ctx->features = 0; |
|---|
| 1968 | 2097 | ctx->released = false; |
|---|
| .. | .. |
|---|
| 1971 | 2100 | /* prevent the mm struct to be freed */ |
|---|
| 1972 | 2101 | mmgrab(ctx->mm); |
|---|
| 1973 | 2102 | |
|---|
| 1974 | | - fd = anon_inode_getfd("[userfaultfd]", &userfaultfd_fops, ctx, |
|---|
| 1975 | | - O_RDWR | (flags & UFFD_SHARED_FCNTL_FLAGS)); |
|---|
| 2103 | + fd = anon_inode_getfd_secure("[userfaultfd]", &userfaultfd_fops, ctx, |
|---|
| 2104 | + O_RDONLY | (flags & UFFD_SHARED_FCNTL_FLAGS), NULL); |
|---|
| 1976 | 2105 | if (fd < 0) { |
|---|
| 1977 | 2106 | mmdrop(ctx->mm); |
|---|
| 1978 | 2107 | kmem_cache_free(userfaultfd_ctx_cachep, ctx); |
|---|