diff options
| author | James Morris | 2014-09-12 14:40:22 +0200 |
|---|---|---|
| committer | James Morris | 2014-09-12 14:40:22 +0200 |
| commit | ac60ab4b4968b54fb5af20eac9dd78e36ad910c1 (patch) | |
| tree | a47e414fb34d91eb012b121d8138c6cee1fe065b /fs/namei.c | |
| parent | seccomp: Add reviewers to MAINTAINERS (diff) | |
| parent | integrity: make integrity files as 'integrity' module (diff) | |
| download | kernel-qcow2-linux-ac60ab4b4968b54fb5af20eac9dd78e36ad910c1.tar.gz kernel-qcow2-linux-ac60ab4b4968b54fb5af20eac9dd78e36ad910c1.tar.xz kernel-qcow2-linux-ac60ab4b4968b54fb5af20eac9dd78e36ad910c1.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 985c6f368485..005771f97189 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3058,7 +3058,7 @@ opened: error = open_check_o_direct(file); if (error) goto exit_fput; - error = ima_file_check(file, op->acc_mode); + error = ima_file_check(file, op->acc_mode, *opened); if (error) goto exit_fput; |