From: Greg Kroah-Hartman Date: Fri, 13 May 2022 09:05:41 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.9.314~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=243b84e62b13c5a76db9ca375bf56df58734c40a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: mm-hugetlb-fix-missing-cache-flush-in-copy_huge_page_from_user.patch mm-userfaultfd-fix-missing-cache-flush-in-mcopy_atomic_pte-and-__mcopy_atomic.patch --- diff --git a/queue-4.14/mm-hugetlb-fix-missing-cache-flush-in-copy_huge_page_from_user.patch b/queue-4.14/mm-hugetlb-fix-missing-cache-flush-in-copy_huge_page_from_user.patch new file mode 100644 index 00000000000..5b1f911899d --- /dev/null +++ b/queue-4.14/mm-hugetlb-fix-missing-cache-flush-in-copy_huge_page_from_user.patch @@ -0,0 +1,47 @@ +From e763243cc6cb1fcc720ec58cfd6e7c35ae90a479 Mon Sep 17 00:00:00 2001 +From: Muchun Song +Date: Tue, 22 Mar 2022 14:41:59 -0700 +Subject: mm: hugetlb: fix missing cache flush in copy_huge_page_from_user() + +From: Muchun Song + +commit e763243cc6cb1fcc720ec58cfd6e7c35ae90a479 upstream. + +userfaultfd calls copy_huge_page_from_user() which does not do any cache +flushing for the target page. Then the target page will be mapped to +the user space with a different address (user address), which might have +an alias issue with the kernel address used to copy the data from the +user to. + +Fix this issue by flushing dcache in copy_huge_page_from_user(). + +Link: https://lkml.kernel.org/r/20220210123058.79206-4-songmuchun@bytedance.com +Fixes: fa4d75c1de13 ("userfaultfd: hugetlbfs: add copy_huge_page_from_user for hugetlb userfaultfd support") +Signed-off-by: Muchun Song +Reviewed-by: Mike Kravetz +Cc: Axel Rasmussen +Cc: David Rientjes +Cc: Fam Zheng +Cc: Kirill A. Shutemov +Cc: Lars Persson +Cc: Peter Xu +Cc: Xiongchun Duan +Cc: Zi Yan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + mm/memory.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -4836,6 +4836,8 @@ long copy_huge_page_from_user(struct pag + if (rc) + break; + ++ flush_dcache_page(subpage); ++ + cond_resched(); + } + return ret_val; diff --git a/queue-4.14/mm-userfaultfd-fix-missing-cache-flush-in-mcopy_atomic_pte-and-__mcopy_atomic.patch b/queue-4.14/mm-userfaultfd-fix-missing-cache-flush-in-mcopy_atomic_pte-and-__mcopy_atomic.patch new file mode 100644 index 00000000000..c302e61fab7 --- /dev/null +++ b/queue-4.14/mm-userfaultfd-fix-missing-cache-flush-in-mcopy_atomic_pte-and-__mcopy_atomic.patch @@ -0,0 +1,55 @@ +From 7c25a0b89a487878b0691e6524fb5a8827322194 Mon Sep 17 00:00:00 2001 +From: Muchun Song +Date: Tue, 22 Mar 2022 14:42:08 -0700 +Subject: mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic() + +From: Muchun Song + +commit 7c25a0b89a487878b0691e6524fb5a8827322194 upstream. + +userfaultfd calls mcopy_atomic_pte() and __mcopy_atomic() which do not +do any cache flushing for the target page. Then the target page will be +mapped to the user space with a different address (user address), which +might have an alias issue with the kernel address used to copy the data +from the user to. Fix this by insert flush_dcache_page() after +copy_from_user() succeeds. + +Link: https://lkml.kernel.org/r/20220210123058.79206-7-songmuchun@bytedance.com +Fixes: b6ebaedb4cb1 ("userfaultfd: avoid mmap_sem read recursion in mcopy_atomic") +Fixes: c1a4de99fada ("userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation") +Signed-off-by: Muchun Song +Cc: Axel Rasmussen +Cc: David Rientjes +Cc: Fam Zheng +Cc: Kirill A. Shutemov +Cc: Lars Persson +Cc: Mike Kravetz +Cc: Peter Xu +Cc: Xiongchun Duan +Cc: Zi Yan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + mm/userfaultfd.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/mm/userfaultfd.c ++++ b/mm/userfaultfd.c +@@ -56,6 +56,8 @@ static int mcopy_atomic_pte(struct mm_st + /* don't free the page */ + goto out; + } ++ ++ flush_dcache_page(page); + } else { + page = *pagep; + *pagep = NULL; +@@ -565,6 +567,7 @@ retry: + err = -EFAULT; + goto out; + } ++ flush_dcache_page(page); + goto retry; + } else + BUG_ON(page); diff --git a/queue-4.14/series b/queue-4.14/series index 299b200b5aa..70da72b5761 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -4,3 +4,5 @@ can-grcan-grcan_probe-fix-broken-system-id-check-for-errata-workaround-needs.pat can-grcan-only-use-the-napi-poll-budget-for-rx.patch bluetooth-fix-the-creation-of-hdev-name.patch mmc-rtsx-add-74-clocks-in-power-on-flow.patch +mm-hugetlb-fix-missing-cache-flush-in-copy_huge_page_from_user.patch +mm-userfaultfd-fix-missing-cache-flush-in-mcopy_atomic_pte-and-__mcopy_atomic.patch