Skip to content

Commit a81c98b

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix netfs_page_mkwrite() to check folio->mapping is valid
Fix netfs_page_mkwrite() to check that folio->mapping is valid once it has taken the folio lock (as filemap_page_mkwrite() does). Without this, generic/247 occasionally oopses with something like the following: BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page RIP: 0010:trace_event_raw_event_netfs_folio+0x61/0xc0 ... Call Trace: <TASK> ? __die_body+0x1a/0x60 ? page_fault_oops+0x6e/0xa0 ? exc_page_fault+0xc2/0xe0 ? asm_exc_page_fault+0x22/0x30 ? trace_event_raw_event_netfs_folio+0x61/0xc0 trace_netfs_folio+0x39/0x40 netfs_page_mkwrite+0x14c/0x1d0 do_page_mkwrite+0x50/0x90 do_pte_missing+0x184/0x200 __handle_mm_fault+0x42d/0x500 handle_mm_fault+0x121/0x1f0 do_user_addr_fault+0x23e/0x3c0 exc_page_fault+0xc2/0xe0 asm_exc_page_fault+0x22/0x30 This is due to the invalidate_inode_pages2_range() issued at the end of the DIO write interfering with the mmap'd writes. Fixes: 102a7e2 ("netfs: Allow buffered shared-writeable mmap through netfs_page_mkwrite()") Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/r/780211.1719318546@warthog.procyon.org.uk Reviewed-by: Jeff Layton <jlayton@kernel.org> cc: Matthew Wilcox <willy@infradead.org> cc: Jeff Layton <jlayton@kernel.org> cc: netfs@lists.linux.dev cc: v9fs@lists.linux.dev cc: linux-afs@lists.infradead.org cc: linux-cifs@vger.kernel.org cc: linux-mm@kvack.org cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 84dfbc9 commit a81c98b

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

fs/netfs/buffered_write.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr
523523
struct netfs_group *group;
524524
struct folio *folio = page_folio(vmf->page);
525525
struct file *file = vmf->vma->vm_file;
526+
struct address_space *mapping = file->f_mapping;
526527
struct inode *inode = file_inode(file);
527528
struct netfs_inode *ictx = netfs_inode(inode);
528529
vm_fault_t ret = VM_FAULT_RETRY;
@@ -534,6 +535,11 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr
534535

535536
if (folio_lock_killable(folio) < 0)
536537
goto out;
538+
if (folio->mapping != mapping) {
539+
folio_unlock(folio);
540+
ret = VM_FAULT_NOPAGE;
541+
goto out;
542+
}
537543

538544
if (folio_wait_writeback_killable(folio)) {
539545
ret = VM_FAULT_LOCKED;
@@ -549,7 +555,7 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr
549555
group = netfs_folio_group(folio);
550556
if (group != netfs_group && group != NETFS_FOLIO_COPY_TO_CACHE) {
551557
folio_unlock(folio);
552-
err = filemap_fdatawait_range(inode->i_mapping,
558+
err = filemap_fdatawait_range(mapping,
553559
folio_pos(folio),
554560
folio_pos(folio) + folio_size(folio));
555561
switch (err) {

0 commit comments

Comments
 (0)