qiurui/Centos-kernel-stream-10
1
0
Fork 0
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git synced 2026-09-09 00:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

userfaultfd: fix a crash in UFFDIO_MOVE when PMD is a migration entry

Browse Source 
JIRA: https://redhat.atlassian.net/browse/RHEL-145695
CVE: CVE-2025-38686

commit aba6faec0103ed8f169be8dce2ead41fcb689446
Author: Suren Baghdasaryan <surenb@google.com>
Date:   Wed Aug 6 15:00:22 2025 -0700

    userfaultfd: fix a crash in UFFDIO_MOVE when PMD is a migration entry

    When UFFDIO_MOVE encounters a migration PMD entry, it proceeds with
    obtaining a folio and accessing it even though the entry is swp_entry_t.
    Add the missing check and let split_huge_pmd() handle migration entries.
    While at it also remove unnecessary folio check.

    [surenb@google.com: remove extra folio check, per David]
      Link: https://lkml.kernel.org/r/20250807200418.1963585-1-surenb@google.com
    Link: https://lkml.kernel.org/r/20250806220022.926763-1-surenb@google.com
    Fixes: adef440691 ("userfaultfd: UFFDIO_MOVE uABI")
    Signed-off-by: Suren Baghdasaryan <surenb@google.com>
    Reported-by: syzbot+b446dbe27035ef6bd6c2@syzkaller.appspotmail.com
    Closes: https://lore.kernel.org/all/68794b5c.a70a0220.693ce.0050.GAE@google.com/
    Reviewed-by: Peter Xu <peterx@redhat.com>
    Acked-by: David Hildenbrand <david@redhat.com>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: Lokesh Gidra <lokeshgidra@google.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Rafael Aquini <raquini@redhat.com>
This commit is contained in:
Rafael Aquini
2026-07-31 14:50:59 -04:00
parent e5f4d19019
commit 33d3a596c1
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/userfaultfd.c
+9 -6
View File
@@ -1821,13 +1821,16 @@ ssize_t move_pages(struct userfaultfd_ctx *ctx, unsigned long dst_start,
/* Check if we can move the pmd without splitting it. */
if (move_splits_huge_pmd(dst_addr, src_addr, src_start + len) ||
!pmd_none(dst_pmdval)) {
struct folio *folio = pmd_folio(*src_pmd);
/* Can be a migration entry */
if (pmd_present(*src_pmd)) {
struct folio *folio = pmd_folio(*src_pmd);
if (!folio || (!is_huge_zero_folio(folio) &&
!PageAnonExclusive(&folio->page))) {
spin_unlock(ptl);
err = -EBUSY;
break;
if (!is_huge_zero_folio(folio) &&
!PageAnonExclusive(&folio->page)) {
spin_unlock(ptl);
err = -EBUSY;
break;
}
}
spin_unlock(ptl);