userfaultfd: hugetlbfs: fix add copy_huge_page_from_user for hugetlb userfaultfd...

Orabug: 21685254

Was in Andrew's patch series on January 17, 2017 as:
userfaultfd hugetlbfs fix __mcopy_atomic_hugetlb retry error processing fix fix

kunmap() takes a page*, per Hugh

Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[ Ported to UEK ]
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/mm/memory.c b/mm/memory.c
index df27b564c41f68c15bb58b6d233aeadd43464673..b0d321a84c4e10b4412e48e6f45c41d88748ebe5 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3869,7 +3869,7 @@ long copy_huge_page_from_user(struct page *dst_page,
                                (const void __user *)(src + i * PAGE_SIZE),
                                PAGE_SIZE);
                if (allow_pagefault)
-                       kunmap(page_kaddr);
+                       kunmap(dst_page + i);
                else
                        kunmap_atomic(page_kaddr);