summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLino Sanfilippo <LinoSanfilippo@gmx.de>2010-11-05 17:05:27 +0100
committerEric Paris <eparis@redhat.com>2010-12-07 16:14:21 -0500
commitb1085ba80cd2784400a7beec3fda5099198ed01c (patch)
treec83530f7d7f161c898d464fc1ce65be38a0268c1 /include/linux
parent88d60c32765716289abeb362c44adf6c35c6824c (diff)
downloadlinux-3.10-b1085ba80cd2784400a7beec3fda5099198ed01c.tar.gz
linux-3.10-b1085ba80cd2784400a7beec3fda5099198ed01c.tar.bz2
linux-3.10-b1085ba80cd2784400a7beec3fda5099198ed01c.zip
fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
Unsetting FMODE_NONOTIFY in fsnotify_open() is too late, since fsnotify_perm() is called before. If FMODE_NONOTIFY is set fsnotify_perm() will skip permission checks, so a user can still disable permission checks by setting this flag in an open() call. This patch corrects this by unsetting the flag before fsnotify_perm is called. Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fsnotify.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 5c185fa2708..b10bcdeaef7 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -235,9 +235,6 @@ static inline void fsnotify_open(struct file *file)
if (S_ISDIR(inode->i_mode))
mask |= FS_ISDIR;
- /* FMODE_NONOTIFY must never be set from user */
- file->f_mode &= ~FMODE_NONOTIFY;
-
fsnotify_parent(path, NULL, mask);
fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
}