aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/userfaultfd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index cd58939dc977..7a85e609fc27 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -1566,7 +1566,6 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
1566 cond_resched(); 1566 cond_resched();
1567 1567
1568 BUG_ON(!vma_can_userfault(vma)); 1568 BUG_ON(!vma_can_userfault(vma));
1569 WARN_ON(!(vma->vm_flags & VM_MAYWRITE));
1570 1569
1571 /* 1570 /*
1572 * Nothing to do: this vma is already registered into this 1571 * Nothing to do: this vma is already registered into this
@@ -1575,6 +1574,8 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
1575 if (!vma->vm_userfaultfd_ctx.ctx) 1574 if (!vma->vm_userfaultfd_ctx.ctx)
1576 goto skip; 1575 goto skip;
1577 1576
1577 WARN_ON(!(vma->vm_flags & VM_MAYWRITE));
1578
1578 if (vma->vm_start > start) 1579 if (vma->vm_start > start)
1579 start = vma->vm_start; 1580 start = vma->vm_start;
1580 vma_end = min(end, vma->vm_end); 1581 vma_end = min(end, vma->vm_end);