Commit 4356ab33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.11-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs fixes from Christian Brauner:
 "Two netfs fixes for this merge window:

   - Ensure that fscache_cookie_lru_time is deleted when the fscache
     module is removed to prevent UAF

   - Fix filemap_invalidate_inode() to use invalidate_inode_pages2_range()

     Before it used truncate_inode_pages_partial() which causes
     copy_file_range() to fail on cifs"

* tag 'vfs-6.11-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  fscache: delete fscache_cookie_lru_timer when fscache exits to avoid UAF
  mm: Fix filemap_invalidate_inode() to use invalidate_inode_pages2_range()
parents c7fb1692 72a6e22c

fs/netfs/fscache_main.c

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void __exit fscache_exit(void) 


	kmem_cache_destroy(fscache_cookie_jar);

	fscache_proc_cleanup();

	timer_shutdown_sync(&fscache_cookie_lru_timer);

	destroy_workqueue(fscache_wq);

	pr_notice("FS-Cache unloaded\n");

}

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -4231,7 +4231,7 @@ int filemap_invalidate_inode(struct inode *inode, bool flush, 
	}



	/* Wait for writeback to complete on all folios and discard. */

	truncate_inode_pages_range(mapping, start, end);

	invalidate_inode_pages2_range(mapping, start / PAGE_SIZE, end / PAGE_SIZE);



unlock:

	filemap_invalidate_unlock(mapping);