linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] dax: fix NULL pointer in __dax_pmd_fault()
@ 2015-09-22 19:36 Ross Zwisler
  2015-09-22 20:51 ` Dan Williams
  2015-09-22 21:13 ` Andrew Morton
  0 siblings, 2 replies; 11+ messages in thread
From: Ross Zwisler @ 2015-09-22 19:36 UTC (permalink / raw)
  To: linux-kernel
  Cc: Ross Zwisler, Alexander Viro, Matthew Wilcox, linux-fsdevel,
	Kirill A. Shutemov, linux-nvdimm, Dan Williams, Dave Chinner

The following commit:

commit 46c043ede471 ("mm: take i_mmap_lock in unmap_mapping_range() for
	DAX")

moved some code in __dax_pmd_fault() that was responsible for zeroing
newly allocated PMD pages.  The new location didn't properly set up
'kaddr', though, so when run this code resulted in a NULL pointer BUG.

Fix this by getting the correct 'kaddr' via bdev_direct_access().

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reported-by: Dan Williams <dan.j.williams@intel.com>
---
 fs/dax.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/fs/dax.c b/fs/dax.c
index 7ae6df7..bcfb14b 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -569,8 +569,20 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
 	if (!buffer_size_valid(&bh) || bh.b_size < PMD_SIZE)
 		goto fallback;
 
+	sector = bh.b_blocknr << (blkbits - 9);
+
 	if (buffer_unwritten(&bh) || buffer_new(&bh)) {
 		int i;
+
+		length = bdev_direct_access(bh.b_bdev, sector, &kaddr, &pfn,
+						bh.b_size);
+		if (length < 0) {
+			result = VM_FAULT_SIGBUS;
+			goto out;
+		}
+		if ((length < PMD_SIZE) || (pfn & PG_PMD_COLOUR))
+			goto fallback;
+
 		for (i = 0; i < PTRS_PER_PMD; i++)
 			clear_pmem(kaddr + i * PAGE_SIZE, PAGE_SIZE);
 		wmb_pmem();
@@ -623,7 +635,6 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
 		result = VM_FAULT_NOPAGE;
 		spin_unlock(ptl);
 	} else {
-		sector = bh.b_blocknr << (blkbits - 9);
 		length = bdev_direct_access(bh.b_bdev, sector, &kaddr, &pfn,
 						bh.b_size);
 		if (length < 0) {
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2015-09-24 16:06 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 19:36 [PATCH v2] dax: fix NULL pointer in __dax_pmd_fault() Ross Zwisler
2015-09-22 20:51 ` Dan Williams
2015-09-22 21:17   ` Ross Zwisler
2015-09-22 21:26     ` Dan Williams
2015-09-22 21:13 ` Andrew Morton
2015-09-22 21:25   ` Dan Williams
2015-09-22 23:30     ` Dave Chinner
2015-09-23  3:00       ` Dan Williams
2015-09-23  9:04         ` Dave Chinner
2015-09-24  8:50           ` Boaz Harrosh
2015-09-24 16:06           ` Dan Williams

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).