Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44b350fc authored by Jerome Marchand's avatar Jerome Marchand Committed by Eric Paris
Browse files

inotify: Fix mask checks 



The mask checks in inotify_update_existing_watch() and
inotify_new_watch() are useless because inotify_arg_to_mask() sets
FS_IN_IGNORED and FS_EVENT_ON_CHILD bits anyway.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent f874e1ac

fs/notify/inotify/inotify_user.c

+2 −2
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group, 


	/* don't allow invalid bits: we don't want flags set */

	mask = inotify_arg_to_mask(arg);

	if (unlikely(!mask))

	if (unlikely(!(mask & IN_ALL_EVENTS)))

		return -EINVAL;



	fsn_mark = fsnotify_find_inode_mark(group, inode);
@@ -624,7 +624,7 @@ static int inotify_new_watch(struct fsnotify_group *group, 


	/* don't allow invalid bits: we don't want flags set */

	mask = inotify_arg_to_mask(arg);

	if (unlikely(!mask))

	if (unlikely(!(mask & IN_ALL_EVENTS)))

		return -EINVAL;



	tmp_i_mark = kmem_cache_alloc(inotify_inode_mark_cachep, GFP_KERNEL);