From: Matthew Wilcox <willy@infradead.org>
Date: Tue, 27 Nov 2018 21:16:33 +0000 (-0800)
Subject: dax: Check page->mapping isn't NULL
X-Git-Tag: v4.19.10~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=384f18115267c0e52748137d6720c81b1cf220e1;p=thirdparty%2Fkernel%2Fstable.git

dax: Check page->mapping isn't NULL

commit c93db7bb6ef3251e0ea48ade311d3e9942748e1c upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/dax.c b/fs/dax.c
index b0cd1364c68fa..3a2682a6c8324 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -423,7 +423,7 @@ bool dax_lock_mapping_entry(struct page *page)
 	for (;;) {
 		mapping = READ_ONCE(page->mapping);
 
-		if (!dax_mapping(mapping))
+		if (!mapping || !dax_mapping(mapping))
 			break;
 
 		/*