From: Jerome Glisse Subject: Re: [PATCH 17/18] dax: Use radix tree entry lock to protect cow faults Date: Tue, 19 Apr 2016 11:19:04 -0400 Message-ID: <20160419151904.GA17318@gmail.com> References: <1461015341-20153-1-git-send-email-jack@suse.cz> <1461015341-20153-18-git-send-email-jack@suse.cz> <20160419114609.GA13932@gmail.com> <20160419143343.GC22413@quack2.suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-mm@kvack.org, Ross Zwisler , Dan Williams , linux-nvdimm@lists.01.org, Matthew Wilcox To: Jan Kara Return-path: Content-Disposition: inline In-Reply-To: <20160419143343.GC22413@quack2.suse.cz> Sender: owner-linux-mm@kvack.org List-Id: linux-ext4.vger.kernel.org On Tue, Apr 19, 2016 at 04:33:43PM +0200, Jan Kara wrote: > On Tue 19-04-16 07:46:09, Jerome Glisse wrote: > > On Mon, Apr 18, 2016 at 11:35:40PM +0200, Jan Kara wrote: > > > diff --git a/mm/memory.c b/mm/memory.c > > > index 93897f23cc11..f09cdb8d48fa 100644 > > > --- a/mm/memory.c > > > +++ b/mm/memory.c > > > @@ -63,6 +63,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > =20 > > > #include > > > #include > > > @@ -2785,7 +2786,8 @@ oom: > > > */ > > > static int __do_fault(struct vm_area_struct *vma, unsigned long ad= dress, > > > pgoff_t pgoff, unsigned int flags, > > > - struct page *cow_page, struct page **page) > > > + struct page *cow_page, struct page **page, > > > + void **entry) > > > { > > > struct vm_fault vmf; > > > int ret; > > > @@ -2800,8 +2802,10 @@ static int __do_fault(struct vm_area_struct = *vma, unsigned long address, > > > ret =3D vma->vm_ops->fault(vma, &vmf); > > > if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_R= ETRY))) > > > return ret; > > > - if (!vmf.page) > > > - goto out; > >=20 > > Removing the above sounds seriously bogus to me as it means that belo= w > > if (unlikely(PageHWPoison(vmf.page))) could dereference a NULL pointe= r. >=20 > If you do not return a valid page, you must return appropriate return c= ode > from the ->fault handler. That being VM_FAULT_NOPAGE, VM_FAULT_DAX_LOCK= ED, > or some error. That has always been the case except for DAX abuse which= was > added by commit 2e4cdab0584f "mm: allow page fault handlers to perform = the > COW" about an year ago. And my patch fixes this abuse. >=20 > I'm not aware of any other code that would start abusing the return val= ue > from the ->fault handler. If some such code indeed got merged during th= e > last year, it should be fixed as well. >=20 Ok my bad i missed that. Cheers, J=E9r=F4me -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org