diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:27:40 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 18:16:47 +0100 |
| commit | b65a9cfc2c38eebc33533280b8ad5841caee8b6e (patch) | |
| tree | d6e5b713615cc5e65c900162ab09235ae4847909 /fs/open.c | |
| parent | Untangling ima mess, part 1: alloc_file() (diff) | |
| download | linux-b65a9cfc2c38eebc33533280b8ad5841caee8b6e.tar.xz linux-b65a9cfc2c38eebc33533280b8ad5841caee8b6e.zip | |
Untangling ima mess, part 2: deal with counters
* do ima_get_count() in __dentry_open()
* stop doing that in followups
* move ima_path_check() to right after nameidata_to_filp()
* don't bump counters on it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/open.c b/fs/open.c index d95651e8be9e..ca69241796bd 100644 --- a/fs/open.c +++ b/fs/open.c @@ -30,6 +30,7 @@ #include <linux/audit.h> #include <linux/falloc.h> #include <linux/fs_struct.h> +#include <linux/ima.h> #include "internal.h" @@ -857,6 +858,7 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, if (error) goto cleanup_all; } + ima_counts_get(f); f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); |