* [patch] dax: fix PMD faults on zero-length files
@ 2017-11-15 1:37 Jeff Moyer
2017-11-15 1:47 ` Dan Williams
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Moyer @ 2017-11-15 1:37 UTC (permalink / raw)
To: linux-nvdimm, ross.zwisler, linux-fsdevel
PMD faults on a zero length file on a file system mounted with -o dax
will not generate SIGBUS as expected.
fd = open(...O_TRUNC);
addr = mmap(NULL, 2*1024*1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
*addr = 'a';
<expect SIGBUS>
The problem is this code in dax_iomap_pmd_fault:
max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;
If the inode size is zero, we end up with a max_pgoff that is way larger
than 0. :) Fix it by using DIV_ROUND_UP, as is done elsewhere in the
kernel.
I tested this with some simple test code that ensured that SIGBUS was
received where expected.
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
diff --git a/fs/dax.c b/fs/dax.c
index f001d8c7..191306c 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1327,7 +1327,7 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf,
* this is a reliable test.
*/
pgoff = linear_page_index(vma, pmd_addr);
- max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;
+ max_pgoff = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);
trace_dax_pmd_fault(inode, vmf, max_pgoff, 0);
@@ -1351,13 +1351,13 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf,
if ((pmd_addr + PMD_SIZE) > vma->vm_end)
goto fallback;
- if (pgoff > max_pgoff) {
+ if (pgoff >= max_pgoff) {
result = VM_FAULT_SIGBUS;
goto out;
}
/* If the PMD would extend beyond the file size */
- if ((pgoff | PG_PMD_COLOUR) > max_pgoff)
+ if ((pgoff | PG_PMD_COLOUR) >= max_pgoff)
goto fallback;
/*
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] dax: fix PMD faults on zero-length files
2017-11-15 1:37 [patch] dax: fix PMD faults on zero-length files Jeff Moyer
@ 2017-11-15 1:47 ` Dan Williams
2017-11-15 19:16 ` Ross Zwisler
0 siblings, 1 reply; 3+ messages in thread
From: Dan Williams @ 2017-11-15 1:47 UTC (permalink / raw)
To: Jeff Moyer
Cc: linux-fsdevel, Zwisler, Ross <ross.zwisler@intel.com>,
linux-nvdimm@lists.01.org
On Tue, Nov 14, 2017 at 5:37 PM, Jeff Moyer <jmoyer@redhat.com> wrote:
> PMD faults on a zero length file on a file system mounted with -o dax
> will not generate SIGBUS as expected.
>
> fd = open(...O_TRUNC);
> addr = mmap(NULL, 2*1024*1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
> *addr = 'a';
> <expect SIGBUS>
>
> The problem is this code in dax_iomap_pmd_fault:
>
> max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;
>
> If the inode size is zero, we end up with a max_pgoff that is way larger
> than 0. :) Fix it by using DIV_ROUND_UP, as is done elsewhere in the
> kernel.
>
> I tested this with some simple test code that ensured that SIGBUS was
> received where expected.
>
I assume this needs:
Fixes: 642261ac995e ("dax: add struct iomap based DAX PMD support")
Cc: <stable@vger.kernel.org>
...otherwise looks good to me.
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] dax: fix PMD faults on zero-length files
2017-11-15 1:47 ` Dan Williams
@ 2017-11-15 19:16 ` Ross Zwisler
0 siblings, 0 replies; 3+ messages in thread
From: Ross Zwisler @ 2017-11-15 19:16 UTC (permalink / raw)
To: Dan Williams
Cc: linux-fsdevel, Zwisler, Ross <ross.zwisler@intel.com>,
linux-nvdimm@lists.01.org
On Tue, Nov 14, 2017 at 05:47:51PM -0800, Dan Williams wrote:
> On Tue, Nov 14, 2017 at 5:37 PM, Jeff Moyer <jmoyer@redhat.com> wrote:
> > PMD faults on a zero length file on a file system mounted with -o dax
> > will not generate SIGBUS as expected.
> >
> > fd = open(...O_TRUNC);
> > addr = mmap(NULL, 2*1024*1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
> > *addr = 'a';
> > <expect SIGBUS>
> >
> > The problem is this code in dax_iomap_pmd_fault:
> >
> > max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;
> >
> > If the inode size is zero, we end up with a max_pgoff that is way larger
> > than 0. :) Fix it by using DIV_ROUND_UP, as is done elsewhere in the
> > kernel.
> >
> > I tested this with some simple test code that ensured that SIGBUS was
> > received where expected.
> >
>
> I assume this needs:
>
> Fixes: 642261ac995e ("dax: add struct iomap based DAX PMD support")
> Cc: <stable@vger.kernel.org>
>
> ...otherwise looks good to me.
Yep, this fix looks good, thanks. You can add:
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-15 19:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-15 1:37 [patch] dax: fix PMD faults on zero-length files Jeff Moyer
2017-11-15 1:47 ` Dan Williams
2017-11-15 19:16 ` Ross Zwisler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).