diff options
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index e8c87b8601b4..7461b1bc296c 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -619,7 +619,13 @@ void security_inode_getsecid(const struct inode *inode, u32 *secid) | |||
619 | 619 | ||
620 | int security_file_permission(struct file *file, int mask) | 620 | int security_file_permission(struct file *file, int mask) |
621 | { | 621 | { |
622 | return security_ops->file_permission(file, mask); | 622 | int ret; |
623 | |||
624 | ret = security_ops->file_permission(file, mask); | ||
625 | if (ret) | ||
626 | return ret; | ||
627 | |||
628 | return fsnotify_perm(file, mask); | ||
623 | } | 629 | } |
624 | 630 | ||
625 | int security_file_alloc(struct file *file) | 631 | int security_file_alloc(struct file *file) |
@@ -683,7 +689,13 @@ int security_file_receive(struct file *file) | |||
683 | 689 | ||
684 | int security_dentry_open(struct file *file, const struct cred *cred) | 690 | int security_dentry_open(struct file *file, const struct cred *cred) |
685 | { | 691 | { |
686 | return security_ops->dentry_open(file, cred); | 692 | int ret; |
693 | |||
694 | ret = security_ops->dentry_open(file, cred); | ||
695 | if (ret) | ||
696 | return ret; | ||
697 | |||
698 | return fsnotify_perm(file, MAY_OPEN); | ||
687 | } | 699 | } |
688 | 700 | ||
689 | int security_task_create(unsigned long clone_flags) | 701 | int security_task_create(unsigned long clone_flags) |