diff --git a/drivers/misc/zcopy/zcopy.c b/drivers/misc/zcopy/zcopy.c
index a20269a3d843bdc76d0a0d026a1c4339983839b7..7885c46538c2fbe498b05d2d4d717a4d815b38db 100644
--- a/drivers/misc/zcopy/zcopy.c
+++ b/drivers/misc/zcopy/zcopy.c
@@ -177,11 +177,12 @@ static pud_t *zcopy_alloc_new_pud(struct mm_struct *mm, unsigned long addr)
 	return zcopy_pud_alloc(mm, p4d, addr);
 }
 
-static pmd_t *zcopy_alloc_pmd(struct mm_struct *mm, unsigned long addr)
+static pmd_t *zcopy_alloc_pmd(struct mm_struct *mm, unsigned long addr, int *rc)
 {
 	pud_t *pud;
 	pmd_t *pmd;
 
+	*rc = -ENOMEM;
 	pud = zcopy_alloc_new_pud(mm, addr);
 	if (!pud)
 		return NULL;
@@ -190,6 +191,12 @@ static pmd_t *zcopy_alloc_pmd(struct mm_struct *mm, unsigned long addr)
 	if (!pmd)
 		return NULL;
 
+	if (pmd_trans_huge(*pmd)) {
+		pr_warn_once("va mapped to hugepage, please free it and realloc va\n");
+		*rc = -EAGAIN;
+		return NULL;
+	}
+
 	return pmd;
 }
 
@@ -394,11 +401,9 @@ static int attach_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 		src_pmd = zcopy_get_pmd(src_mm, src_addr);
 		if (!src_pmd)
 			continue;
-		dst_pmd = zcopy_alloc_pmd(dst_mm, dst_addr);
-		if (!dst_pmd) {
-			ret = -ENOMEM;
+		dst_pmd = zcopy_alloc_pmd(dst_mm, dst_addr, &ret);
+		if (!dst_pmd)
 			break;
-		}
 
 		if (pmd_trans_huge(*src_pmd)) {
 			if (extent == HPAGE_PMD_SIZE) {
@@ -445,7 +450,7 @@ static int attach_pages(unsigned long dst_addr, unsigned long src_addr,
 	struct task_struct *src_task, *dst_task;
 	struct page **process_pages;
 	unsigned long nr_pages;
-	unsigned int flags = 0;
+	unsigned int flags = FOLL_NOFAULT;
 	int pinned_pages;
 	int locked = 1;
 	int ret;