linux-kernel - RFC][PATCH] inotify: Fix mask checks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <4BF3D10D.2040902@redhat.com>
Date:	Wed, 19 May 2010 13:52:45 +0200
From:	Jerome Marchand <jmarchan@...hat.com>
To:	Eric Paris <eparis@...isplace.org>, Robert Love <rlove@...ve.org>,
	John McCutchan <john@...nmccutchan.com>
CC:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: RFC][PATCH] 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. 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 <jmarchan@...hat.com>

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.

Signed-off-by: Jerome Marchand <jmarchan@...hat.com>
---
 inotify_user.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index e46ca68..a95ca25 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/