Skip to contentSkip to conversation

RFC][PATCH] inotify: Fix mask checks

PATCH Jerome Marchand 1 participant 1 message May 19, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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. We should either test that at least one of the user events is set (see the untested patch below) or remove the test completely if we consider OK to only watch for the implicit events (IN_UNMOUNT, IN_Q_OVERFLOW and IN_IGNORED).

Btw, is it necessary to set IN_IGNORED in inotify_arg_to_mask()? Wouldn't the IN_IGNORED event be send anyway, whatever that bit is set or not in the mask?

Thanks,
Jerome

---
From: Jerome Marchand <[email protected]>

Currently, 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.

Check that at least one user event is set.

---
 inotify_user.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/notify/inotify/inotify_user.c +2 -2
index e46ca68..a95ca25 100644
@@ -467,7 +467,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;
 
 	spin_lock(&inode->i_lock);
@@ -527,7 +527,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_ientry = kmem_cache_alloc(inotify_inode_mark_cachep, GFP_KERNEL);