Merge branch 'mm-hotfixes-stable' into mm-stable

To pick up depended-upon changes

1 files changed, 5 insertions, 2 deletions

diff --git a/mm/ksm.c b/mm/ksm.c
index cea0c4478220..ad591b779d53 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2628,8 +2628,11 @@ struct page *ksm_might_need_to_copy(struct page *page,
 		new_page = NULL;
 	}
 	if (new_page) {
-		copy_user_highpage(new_page, page, address, vma);
-
+		if (copy_mc_user_highpage(new_page, page, address, vma)) {
+			put_page(new_page);
+			memory_failure_queue(page_to_pfn(page), 0);
+			return ERR_PTR(-EHWPOISON);
+		}
 		SetPageDirty(new_page);
 		__SetPageUptodate(new_page);
 		__SetPageLocked(new_page);