diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 01:53:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 01:53:20 +0200 |
| commit | b883a688ce4ba60ba4295ef9bf9854647f4d106e (patch) | |
| tree | ec11ae4b89d7a95e4f6e4d5be7b0ef1b87d54a2d /fs | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | SELinux: kills warnings in Improve SELinux performance when AVC misses (diff) | |
| download | linux-b883a688ce4ba60ba4295ef9bf9854647f4d106e.tar.xz linux-b883a688ce4ba60ba4295ef9bf9854647f4d106e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: kills warnings in Improve SELinux performance when AVC misses
SELinux: improve performance when AVC misses.
SELinux: policy selectable handling of unknown classes and perms
SELinux: Improve read/write performance
SELinux: tune avtab to reduce memory usage
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/open.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/open.c b/fs/open.c index 1d9e5e98bf4e..044bfa891c94 100644 --- a/fs/open.c +++ b/fs/open.c @@ -757,6 +757,10 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, f->f_op = fops_get(inode->i_fop); file_move(f, &inode->i_sb->s_files); + error = security_dentry_open(f); + if (error) + goto cleanup_all; + if (!open && f->f_op) open = f->f_op->open; if (open) { |