Skip to contentSkip to conversation

inotify: actually check for invalid bits in sys_inotify_add_watch()

PATCH New Dave Hansen 1 participant 1 message Sep 10, 2015

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

PATCH v2 1/1 inotify: actually check for invalid bits in sys_inotify_add_watch()

Changes from V1:
* beef up changelog and comment text.

---

From: Dave Hansen <[email protected]>

The comment here says that it is checking for invalid bits. But, the mask is *actually* checking to ensure that _any_ valid bit is set, which is quite different.

Without this check, an unexpected bit could get set on an inotify object. Since these bits are also interpreted by the fsnotify/dnotify code, there is the potential for an object to be mishandled inside the kernel. For instance, can we be sure that setting the dnotify flag FS_DN_RENAME on an inotify watch is harmless?

Add the actual check which was intended. Retain the existing check because it actually does something useful: ensure that some inotify bits are being added to the watch. Plus, this is existing behavior which would be nice to preserve.

I did a quick sniff test that inotify functions and that my 'inotify-tools' package passes 'make check'.

Cc John McCutchan <[email protected]> (maintainer:INOTIFY)
Cc Robert Love <[email protected]> (maintainer:INOTIFY)
Cc Eric Paris <[email protected]> (maintainer:INOTIFY)
Cc [email protected] (open list)

---

 b/fs/notify/inotify/inotify_user.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
fs/notify/inotify/inotify_user.c renamed from fs/notify/inotify/inotify_user.c~inotify-EINVAL-on-invalid-bit +13 -1
diff -puN fs/notify/inotify/inotify_user.c~inotify-EINVAL-on-invalid-bit fs/notify/inotify/inotify_user.c
@@ -706,7 +706,19 @@ SYSCALL_DEFINE3(inotify_add_watch, int,
 	int ret;
 	unsigned flags = 0;
 
-	/* don't allow invalid bits: we don't want flags set */
+	/*
+	 * We share a lot of code with fs/dnotify.  We also share
+	 * the bit layout between inotify's IN_* and the fsnotify
+	 * FS_*.  This check ensures that only the inotify IN_*
+	 * bits get passed in and set in watches/events.
+	 */
+	if (unlikely(mask & ~ALL_INOTIFY_BITS))
+		return -EINVAL;
+	/*
+	 * Require at least one valid bit set in the mask.
+	 * Without _something_ set, we would have no events to
+	 * watch for.
+	 */
 	if (unlikely(!(mask & ALL_INOTIFY_BITS)))
 		return -EINVAL;
 

_