Merge remote branch 'fsnotify/for-next'

Conflicts:
	fs/notify/inotify/inotify_user.c
	include/linux/fsnotify.h
	kernel/audit_tree.c
	kernel/sysctl.c

1 files changed, 14 insertions, 2 deletions

diff --git a/security/security.c b/security/security.c
index b98334b0a576..84884f943438 100644
--- a/security/security.c
+++ b/security/security.c
@@ -662,7 +662,13 @@ void security_inode_getsecid(const struct inode *inode, u32 *secid)
 
 int security_file_permission(struct file *file, int mask)
 {
-	return security_ops->file_permission(file, mask);
+	int ret;
+
+	ret = security_ops->file_permission(file, mask);
+	if (ret)
+		return ret;
+
+	return fsnotify_perm(file, mask);
 }
 
 int security_file_alloc(struct file *file)
@@ -726,7 +732,13 @@ int security_file_receive(struct file *file)
 
 int security_dentry_open(struct file *file, const struct cred *cred)
 {
-	return security_ops->dentry_open(file, cred);
+	int ret;
+
+	ret = security_ops->dentry_open(file, cred);
+	if (ret)
+		return ret;
+
+	return fsnotify_perm(file, MAY_OPEN);
 }
 
 int security_task_create(unsigned long clone_flags)