diff --git a/drivers/misc/zcopy/zcopy.c b/drivers/misc/zcopy/zcopy.c
index f4c56ce07e66800b1cc78b93d647e9b73b022cb3..a64bc468c46a0ead606b88bde50c259118394604 100644
--- a/drivers/misc/zcopy/zcopy.c
+++ b/drivers/misc/zcopy/zcopy.c
@@ -179,6 +179,9 @@ static pud_t *zcopy_get_pud(struct mm_struct *mm, unsigned long addr)
 	if (pud_none(*pud))
 		return NULL;
 
+	if (!pud_table(*pud))
+		return NULL;
+
 	return pud;
 }
 
@@ -709,7 +712,9 @@ static int attach_pages(unsigned long dst_addr, unsigned long src_addr,
 	}
 
 	trace_attach_page_range_start(dst_mm, src_mm, dst_addr, src_addr, size);
+	mmap_read_lock(src_mm);
 	ret = attach_page_range(dst_mm, src_mm, dst_addr, src_addr, size);
+	mmap_read_unlock(src_mm);
 	trace_attach_page_range_end(dst_mm, src_mm, dst_addr, src_addr, ret);
 
 	unpin_user_pages_dirty_lock(process_pages, pinned_pages, 0);