diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-12 07:16:37 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-12 07:16:37 +0400 |
| commit | 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252 (patch) | |
| tree | d0796f172c096147e1a7c0337279bf7dca6f13f2 /fs/file_table.c | |
| parent | b25b09ecf98bf6a32f3732281c2db13be6aeb14c (diff) | |
| parent | 8606404fa555c2ee691376fcc640ab89fe752035 (diff) | |
| download | linux-9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252.tar.xz | |
Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
As requested by Mimi, this adds the IMA Appraisal feature.
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 701985e4ccda..a41f23f90b17 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -243,10 +243,10 @@ static void __fput(struct file *file) if (file->f_op && file->f_op->fasync) file->f_op->fasync(-1, file, 0); } + ima_file_free(file); if (file->f_op && file->f_op->release) file->f_op->release(inode, file); security_file_free(file); - ima_file_free(file); if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL && !(file->f_mode & FMODE_PATH))) { cdev_put(inode->i_cdev); |