linux-kernel - Re: [PATCH] filemap: replace pte_offset_map() with pte_offset_map

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240704114039.4fd0739593cd0a96fe428496@linux-foundation.org>
Date: Thu, 4 Jul 2024 11:40:39 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Peng Zhang <zhangpeng362@...wei.com>, <linux-mm@...ck.org>,
 <linux-kernel@...r.kernel.org>, <willy@...radead.org>,
 <ying.huang@...el.com>, <fengwei.yin@...el.com>, <david@...hat.com>,
 <aneesh.kumar@...ux.ibm.com>, <shy828301@...il.com>, <hughd@...gle.com>,
 <wangkefeng.wang@...wei.com>, <sunnanyong@...wei.com>
Subject: Re: [PATCH] filemap: replace pte_offset_map() with
 pte_offset_map_nolock()

On Tue, 25 Jun 2024 14:06:43 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:

> On Wed, 13 Mar 2024 09:29:13 +0800 Peng Zhang <zhangpeng362@...wei.com> wrote:
> 
> > From: ZhangPeng <zhangpeng362@...wei.com>
> > 
> > The vmf->ptl in filemap_fault_recheck_pte_none() is still set from
> > handle_pte_fault(). But at the same time, we did a pte_unmap(vmf->pte).
> > After a pte_unmap(vmf->pte) unmap and rcu_read_unlock(), the page table
> > may be racily changed and vmf->ptl maybe fails to protect the actual
> > page table.
> > Fix this by replacing pte_offset_map() with pte_offset_map_nolock().
> > 
> > ...
> >
> > --- a/mm/filemap.c
> > +++ b/mm/filemap.c
> > @@ -3207,7 +3207,8 @@ static vm_fault_t filemap_fault_recheck_pte_none(struct vm_fault *vmf)
> >  	if (!(vmf->flags & FAULT_FLAG_ORIG_PTE_VALID))
> >  		return 0;
> >  
> > -	ptep = pte_offset_map(vmf->pmd, vmf->address);
> > +	ptep = pte_offset_map_nolock(vma->vm_mm, vmf->pmd, vmf->address,
> > +				     &vmf->ptl);
> >  	if (unlikely(!ptep))
> >  		return VM_FAULT_NOPAGE;
> >  
> 
> whoops, I'm still sitting on this because I didn't know whether we
> should backport it.
> 
> And...  guess what I say next.  Can we please describe what are the
> userspace visible effects of the bug?
> 

Nobody?

Oh well, I'll add cc:stable amd move this into mm-hotfixes.


From: ZhangPeng <zhangpeng362@...wei.com>
Subject: filemap: replace pte_offset_map() with pte_offset_map_nolock()
Date: Wed, 13 Mar 2024 09:29:13 +0800

The vmf->ptl in filemap_fault_recheck_pte_none() is still set from
handle_pte_fault().  But at the same time, we did a pte_unmap(vmf->pte). 
After a pte_unmap(vmf->pte) unmap and rcu_read_unlock(), the page table
may be racily changed and vmf->ptl maybe fails to protect the actual page
table.  Fix this by replacing pte_offset_map() with
pte_offset_map_nolock().

Link: https://lkml.kernel.org/r/20240313012913.2395414-1-zhangpeng362@huawei.com
Fixes: 58f327f2ce80 ("filemap: avoid unnecessary major faults in filemap_fault()")
Signed-off-by: ZhangPeng <zhangpeng362@...wei.com>
Suggested-by: David Hildenbrand <david@...hat.com>
Reviewed-by: David Hildenbrand <david@...hat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@...ux.ibm.com>
Cc: "Huang, Ying" <ying.huang@...el.com>
Cc: Hugh Dickins <hughd@...gle.com>
Cc: Kefeng Wang <wangkefeng.wang@...wei.com>
Cc: Matthew Wilcox (Oracle) <willy@...radead.org>
Cc: Nanyong Sun <sunnanyong@...wei.com>
Cc: Yang Shi <shy828301@...il.com>
Cc: Yin Fengwei <fengwei.yin@...el.com>
Cc: <stable@...r.kernel.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---

 mm/filemap.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/mm/filemap.c~filemap-replace-pte_offset_map-with-pte_offset_map_nolock
+++ a/mm/filemap.c
@@ -3231,7 +3231,8 @@ static vm_fault_t filemap_fault_recheck_
 	if (!(vmf->flags & FAULT_FLAG_ORIG_PTE_VALID))
 		return 0;
 
-	ptep = pte_offset_map(vmf->pmd, vmf->address);
+	ptep = pte_offset_map_nolock(vma->vm_mm, vmf->pmd, vmf->address,
+				     &vmf->ptl);
 	if (unlikely(!ptep))
 		return VM_FAULT_NOPAGE;
 
_