dax: Check page->mapping isn't NULL
authorMatthew Wilcox <willy@infradead.org>
Tue, 27 Nov 2018 21:16:33 +0000 (13:16 -0800)
committerDan Williams <dan.j.williams@intel.com>
Wed, 28 Nov 2018 19:08:08 +0000 (11:08 -0800)
If we race with inode destroy, it's possible for page->mapping to be
NULL before we even enter this routine, as well as after having slept
waiting for the dax entry to become unlocked.

Fixes: c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
Cc: <stable@vger.kernel.org>
Reported-by: Jan Kara <jack@suse.cz>
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
fs/dax.c

index 9bcce89..e69fc23 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -365,7 +365,7 @@ bool dax_lock_mapping_entry(struct page *page)
                struct address_space *mapping = READ_ONCE(page->mapping);
 
                locked = false;
-               if (!dax_mapping(mapping))
+               if (!mapping || !dax_mapping(mapping))
                        break;
 
                /*