Commit 986ffe60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsnotify_for_v6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull fsnotify fix from Jan Kara:
 "A fix for fanotify to disallow creating of mount or superblock marks
  for kernel internal pseudo filesystems"

* tag 'fsnotify_for_v6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fanotify: disallow mount/sb marks on kernel internal pseudo fs
parents 4f6b6c2b 69562eb0

fs/notify/fanotify/fanotify_user.c

+14 −0
Original line number Diff line number Diff line
@@ -1622,6 +1622,20 @@ static int fanotify_events_supported(struct fsnotify_group *group, 
	    path->mnt->mnt_sb->s_type->fs_flags & FS_DISALLOW_NOTIFY_PERM)

		return -EINVAL;



	/*

	 * mount and sb marks are not allowed on kernel internal pseudo fs,

	 * like pipe_mnt, because that would subscribe to events on all the

	 * anonynous pipes in the system.

	 *

	 * SB_NOUSER covers all of the internal pseudo fs whose objects are not

	 * exposed to user's mount namespace, but there are other SB_KERNMOUNT

	 * fs, like nsfs, debugfs, for which the value of allowing sb and mount

	 * mark is questionable. For now we leave them alone.

	 */

	if (mark_type != FAN_MARK_INODE &&

	    path->mnt->mnt_sb->s_flags & SB_NOUSER)

		return -EINVAL;



	/*

	 * We shouldn't have allowed setting dirent events and the directory

	 * flags FAN_ONDIR and FAN_EVENT_ON_CHILD in mask of non-dir inode,