---

yaml --- r: 180332 b: refs/heads/master c: 89068c5 h: refs/heads/master v: v3
git-mirror · Feb 7, 2010 · 10132ac · 10132ac
1 parent aceed37
commit 10132ac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e93d0052d9a6b3d0b382eedceb18b519d603baf
+refs/heads/master: 89068c576bf324ef6fbd50dfc745148f7def202c
diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c
@@ -253,6 +253,7 @@ void __fput(struct file *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))
 		cdev_put(inode->i_cdev);
 	fops_put(file->f_op);

diff --git a/trunk/security/security.c b/trunk/security/security.c
@@ -666,8 +666,6 @@ int security_file_alloc(struct file *file)
 void security_file_free(struct file *file)
 {
 	security_ops->file_free_security(file);
-	if (file->f_dentry)
-		ima_file_free(file);
 }
 
 int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)