X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Fuserfaultfd.c;h=eee7320ab0b028c31676a6f8e59f9748fecc9671;hb=61307b7be41a1f1039d1d1368810a1d92cb97b44;hp=2a564f813314300896b36fb2d5a48f9ae8eb38b9;hpb=c59cebe8ff779df029d19e5525d4557fd70a769b;p=linux-2.6-microblaze.git

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 2a564f813314..eee7320ab0b0 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -658,7 +658,10 @@ int dup_userfaultfd(struct vm_area_struct *vma, struct list_head *fcs)
 	struct userfaultfd_fork_ctx *fctx;
 
 	octx = vma->vm_userfaultfd_ctx.ctx;
-	if (!octx || !(octx->features & UFFD_FEATURE_EVENT_FORK)) {
+	if (!octx)
+		return 0;
+
+	if (!(octx->features & UFFD_FEATURE_EVENT_FORK)) {
 		vma_start_write(vma);
 		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
 		userfaultfd_set_vm_flags(vma, vma->vm_flags & ~__VM_UFFD_FLAGS);