Unverified Commit 6657a267 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5641 userfaultfd: early return in dup_userfaultfd() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Peng Zhang <zhangpeng362@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SUQZ2XD6XHXVFL7IQXD4HIWSO4ROR34A/ 
 
https://gitee.com/openeuler/kernel/issues/I9CKXN 
 
Link:https://gitee.com/openeuler/kernel/pulls/5641

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents c9b60916 eefe0a4f

fs/userfaultfd.c

+4 −1
Original line number Diff line number Diff line
@@ -707,7 +707,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);