kevin/linux
1
Fork 0
Code

vfs-6.11-rc7.fixes

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCZtQmqAAKCRCRxhvAZXjc
 os+mAP47NBhOecERCJSmS0RFMuRvc0ijxz1642emEthZhtf8qQD/cy56WmGZqEFZ
 bfj5v6tGmsxGt4xMDUDNG0pvqba8hwA=
 =JBA5
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2024-09-04 09:33:57 -07:00
commit 4356ab331c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/netfs/fscache_main.c
View File

@ -103,6 +103,7 @@ void __exit fscache_exit(void)
kmem_cache_destroy(fscache_cookie_jar); kmem_cache_destroy(fscache_cookie_jar);
fscache_proc_cleanup(); fscache_proc_cleanup();
timer_shutdown_sync(&fscache_cookie_lru_timer);
destroy_workqueue(fscache_wq); destroy_workqueue(fscache_wq);
pr_notice("FS-Cache unloaded\n"); pr_notice("FS-Cache unloaded\n");
} }

2
mm/filemap.c
View File

@ -4231,7 +4231,7 @@ int filemap_invalidate_inode(struct inode *inode, bool flush,
} }
/* Wait for writeback to complete on all folios and discard. */ /* 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: unlock:
filemap_invalidate_unlock(mapping); filemap_invalidate_unlock(mapping);