fsnotify: Fix ordering of iput() and watched_objects decrement
authorJann Horn <jannh@google.com>
Mon, 18 Nov 2024 16:33:13 +0000 (17:33 +0100)
committerJan Kara <jack@suse.cz>
Mon, 18 Nov 2024 16:33:13 +0000 (17:33 +0100)
commit21d1b618b6b9da46c5116c640ac4b1cc8d40d63a
tree9359bcb968a59530fb9b17ee85d1e48c6b36b500
parentaa52c54da40d9eee3ba87c05cdcb0cd07c04fa13
fsnotify: Fix ordering of iput() and watched_objects decrement

Ensure the superblock is kept alive until we're done with iput().
Holding a reference to an inode is not allowed unless we ensure the
superblock stays alive, which fsnotify does by keeping the
watched_objects count elevated, so iput() must happen before the
watched_objects decrement.
This can lead to a UAF of something like sb->s_fs_info in tmpfs, but the
UAF is hard to hit because race orderings that oops are more likely, thanks
to the CHECK_DATA_CORRUPTION() block in generic_shutdown_super().

Also, ensure that fsnotify_put_sb_watched_objects() doesn't call
fsnotify_sb_watched_objects() on a superblock that may have already been
freed, which would cause a UAF read of sb->s_fsnotify_info.

Cc: stable@kernel.org
Fixes: d2f277e26f52 ("fsnotify: rename fsnotify_{get,put}_sb_connectors()")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/notify/mark.c