1 files changed, 4 insertions, 0 deletions
diff --git a/mm/gup.c b/mm/gup.c
index 12b9626b1a9e..c3a9fd237da1 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -662,6 +662,8 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 	if (!nr_pages)
 		return 0;
 
+	start = untagged_addr(start);
+
 	VM_BUG_ON(!!pages != !!(gup_flags & FOLL_GET));
 
 	/*
@@ -816,6 +818,8 @@ int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
 	struct vm_area_struct *vma;
 	int ret, major = 0;
 
+	address = untagged_addr(address);
+
 	if (unlocked)
 		fault_flags |= FAULT_FLAG_ALLOW_RETRY;