From: Muchun Song <songmuchun@bytedance.com>
To: akpm@linux-foundation.org, zi.yan@cs.rutgers.edu,
kirill.shutemov@linux.intel.com, rientjes@google.com,
lars.persson@axis.com, mike.kravetz@oracle.com, ziy@nvidia.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
duanxiongchun@bytedance.com, fam.zheng@bytedance.com,
Muchun Song <songmuchun@bytedance.com>
Subject: [PATCH v5 6/7] mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic()
Date: Thu, 10 Feb 2022 20:30:57 +0800 [thread overview]
Message-ID: <20220210123058.79206-7-songmuchun@bytedance.com> (raw)
In-Reply-To: <20220210123058.79206-1-songmuchun@bytedance.com>
The 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.
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 <songmuchun@bytedance.com>
---
mm/userfaultfd.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index 0780c2a57ff1..6ccc534d1c1c 100644
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -150,6 +150,8 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm,
/* don't free the page */
goto out;
}
+
+ flush_dcache_page(page);
} else {
page = *pagep;
*pagep = NULL;
@@ -625,6 +627,7 @@ static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm,
err = -EFAULT;
goto out;
}
+ flush_dcache_page(page);
goto retry;
} else
BUG_ON(page);
--
2.11.0
next prev parent reply other threads:[~2022-02-10 12:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 12:30 [PATCH v5 0/7] Fix some cache flush bugs Muchun Song
2022-02-10 12:30 ` [PATCH v5 1/7] mm: thp: fix wrong cache flush in remove_migration_pmd() Muchun Song
2022-02-10 12:30 ` [PATCH v5 2/7] mm: fix missing cache flush for all tail pages of compound page Muchun Song
2022-02-10 12:30 ` [PATCH v5 3/7] mm: hugetlb: fix missing cache flush in copy_huge_page_from_user() Muchun Song
2022-02-10 12:30 ` [PATCH v5 4/7] mm: hugetlb: fix missing cache flush in hugetlb_mcopy_atomic_pte() Muchun Song
2022-02-10 12:30 ` [PATCH v5 5/7] mm: shmem: fix missing cache flush in shmem_mfill_atomic_pte() Muchun Song
2022-02-15 19:11 ` Mike Kravetz
2022-02-16 6:16 ` Muchun Song
2022-02-10 12:30 ` Muchun Song [this message]
2022-02-15 19:13 ` [PATCH v5 6/7] mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic() Mike Kravetz
2022-02-10 12:30 ` [PATCH v5 7/7] mm: replace multiple dcache flush with flush_dcache_folio() Muchun Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220210123058.79206-7-songmuchun@bytedance.com \
--to=songmuchun@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=duanxiongchun@bytedance.com \
--cc=fam.zheng@bytedance.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=lars.persson@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=rientjes@google.com \
--cc=zi.yan@cs.rutgers.edu \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox