Commit 0321e03c authored Jan 10, 2019 by Amir Goldstein Committed by Jan Kara Feb 07, 2019

fanotify: check FS_ISDIR flag instead of d_is_dir()



All fsnotify hooks set the FS_ISDIR flag for events that happen
on directory victim inodes except for fsnotify_perm().

Add the missing FS_ISDIR flag in fsnotify_perm() hook and let
fanotify_group_event_mask() check the FS_ISDIR flag instead of
checking if path argument is a directory.

This is needed for fanotify support for event types that do not
carry path information.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

parent 0a20df7e

fs/notify/fanotify/fanotify.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ static u32 fanotify_group_event_mask(struct fsnotify_iter_info *iter_info,
		marks_ignored_mask \|= mark->ignored_mask;
		}

		if (d_is_dir(path->dentry) &&
		if (event_mask & FS_ISDIR &&
		!(marks_mask & FS_ISDIR & ~marks_ignored_mask))
		return 0;

include/linux/fsnotify.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,9 @@ static inline int fsnotify_perm(struct file *file, int mask)
		fsnotify_mask = FS_ACCESS_PERM;
		}

		if (S_ISDIR(inode->i_mode))
		fsnotify_mask \|= FS_ISDIR;

		return fsnotify_path(inode, path, fsnotify_mask);
		}

Admin message