Patch "mm: fix oops when filemap_map_pmd() without prealloc_pte" has been added to the 5.15-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    mm: fix oops when filemap_map_pmd() without prealloc_pte

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mm-fix-oops-when-filemap_map_pmd-without-prealloc_pt.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit ad7560171c6f2898fc8fa8e05730a978de531778
Author: Hugh Dickins <hughd@xxxxxxxxxx>
Date:   Fri Nov 17 00:49:18 2023 -0800

    mm: fix oops when filemap_map_pmd() without prealloc_pte
    
    [ Upstream commit 9aa1345d66b8132745ffb99b348b1492088da9e2 ]
    
    syzbot reports oops in lockdep's __lock_acquire(), called from
    __pte_offset_map_lock() called from filemap_map_pages(); or when I run the
    repro, the oops comes in pmd_install(), called from filemap_map_pmd()
    called from filemap_map_pages(), just before the __pte_offset_map_lock().
    
    The problem is that filemap_map_pmd() has been assuming that when it finds
    pmd_none(), a page table has already been prepared in prealloc_pte; and
    indeed do_fault_around() has been careful to preallocate one there, when
    it finds pmd_none(): but what if *pmd became none in between?
    
    My 6.6 mods in mm/khugepaged.c, avoiding mmap_lock for write, have made it
    easy for *pmd to be cleared while servicing a page fault; but even before
    those, a huge *pmd might be zapped while a fault is serviced.
    
    The difference in symptomatic stack traces comes from the "memory model"
    in use: pmd_install() uses pmd_populate() uses page_to_pfn(): in some
    models that is strict, and will oops on the NULL prealloc_pte; in other
    models, it will construct a bogus value to be populated into *pmd, then
    __pte_offset_map_lock() oops when trying to access split ptlock pointer
    (or some other symptom in normal case of ptlock embedded not pointer).
    
    Link: https://lore.kernel.org/linux-mm/20231115065506.19780-1-jose.pekkarinen@xxxxxxxxxxx/
    Link: https://lkml.kernel.org/r/6ed0c50c-78ef-0719-b3c5-60c0c010431c@xxxxxxxxxx
    Fixes: f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths")
    Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
    Reported-and-tested-by: syzbot+89edd67979b52675ddec@xxxxxxxxxxxxxxxxxxxxxxxxx
    Closes: https://lore.kernel.org/linux-mm/0000000000005e44550608a0806c@xxxxxxxxxx/
    Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
    Cc: Jann Horn <jannh@xxxxxxxxxx>,
    Cc: José Pekkarinen <jose.pekkarinen@xxxxxxxxxxx>
    Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
    Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
    Cc: <stable@xxxxxxxxxxxxxxx>    [5.12+]
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/mm/filemap.c b/mm/filemap.c
index 179eb8066c9b3..e653f2ad5aed1 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3209,7 +3209,7 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct page *page)
 	    }
 	}
 
-	if (pmd_none(*vmf->pmd))
+	if (pmd_none(*vmf->pmd) && vmf->prealloc_pte)
 		pmd_install(mm, vmf->pmd, &vmf->prealloc_pte);
 
 	/* See comment in handle_pte_fault() */




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux