VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2012-10-02 21:38:48 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-10-02 21:38:48 -0700 commit: 88265322c14cce39f7afbc416726ef4fac413298 parent: 65b99c74fdd325d1ffa2e5663295888704712604

Commit Summary:

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/fs/file_table.c b/fs/file_table.c
index c6780163bf3e..dac67923330f 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);