Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1246201

[PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check

Show all headers | View raw

Update dax_pfn_mkwrite() so that it validates i_size before returning.
This is necessary to ensure that the page fault has not raced with truncate
and is now pointing to a region beyond the end of the current file.

This change is based on a similar outstanding patch for XFS from Dave
Chinner entitled "xfs: add ->pfn_mkwrite support for DAX".

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Dave Chinner <david@fromorbit.com>
---
 fs/dax.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/dax.c b/fs/dax.c
index 131fd35a..82be6e4 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -693,12 +693,21 @@ EXPORT_SYMBOL_GPL(dax_pmd_fault);
  */
 int dax_pfn_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-	struct super_block *sb = file_inode(vma->vm_file)->i_sb;
+	struct inode *inode = file_inode(vma->vm_file);
+	struct super_block *sb = inode->i_sb;
+	int ret = VM_FAULT_NOPAGE;
+	loff_t size;
 
 	sb_start_pagefault(sb);
 	file_update_time(vma->vm_file);
+
+	/* check that the faulting page hasn't raced with truncate */
+	size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;
+	if (vmf->pgoff >= size)
+		ret = VM_FAULT_SIGBUS;
+
 	sb_end_pagefault(sb);
-	return VM_FAULT_NOPAGE;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(dax_pfn_mkwrite);
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check Ross Zwisler <ross.zwisler@linux.intel.com> - 2015-10-14 00:30 +0200
  Re: [PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check Dave Chinner <david@fromorbit.com> - 2015-10-14 07:30 +0200
    Re: [PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check Jan Kara <jack@suse.cz> - 2015-10-14 10:50 +0200
      Re: [PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check Dave Chinner <david@fromorbit.com> - 2015-10-15 01:00 +0200
        Re: [PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check Jan Kara <jack@suse.cz> - 2015-10-16 10:00 +0200
    Re: [PATCH v2 1/2] dax: dax_pfn_mkwrite() truncate race check Ross Zwisler <ross.zwisler@linux.intel.com> - 2015-10-14 19:30 +0200

csiph-web