diff options
| author | James Morris <jmorris@namei.org> | 2009-06-11 03:03:14 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-11 03:03:14 +0200 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /fs/namei.c | |
| parent | Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | nommu: Provide mmap_min_addr definition. (diff) | |
| download | linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.xz linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index 967c3db92724..c82805d088e1 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -853,7 +853,8 @@ static int __link_path_walk(const char *name, struct nameidata *nd) err = inode_permission(nd->path.dentry->d_inode, MAY_EXEC); if (!err) - err = ima_path_check(&nd->path, MAY_EXEC); + err = ima_path_check(&nd->path, MAY_EXEC, + IMA_COUNT_UPDATE); if (err) break; @@ -1515,7 +1516,8 @@ int may_open(struct path *path, int acc_mode, int flag) return error; error = ima_path_check(path, - acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC)); + acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC), + IMA_COUNT_UPDATE); if (error) return error; /* |