From: Al Viro Date: Sun, 7 Feb 2010 08:07:29 +0000 (-0500) Subject: Take ima_file_free() to proper place. X-Git-Tag: firefly_0821_release~9833^2~3217^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=89068c576bf324ef6fbd50dfc745148f7def202c;hp=1e93d0052d9a6b3d0b382eedceb18b519d603baf;p=firefly-linux-kernel-4.4.55.git Take ima_file_free() to proper place. Hooks: Just Say No. Signed-off-by: Al Viro --- diff --git a/fs/file_table.c b/fs/file_table.c index 69652c5bd5f0..b98404b54383 100644 --- a/fs/file_table.c +++ b/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/security/security.c b/security/security.c index 24e060be9fa5..122b748d0f4c 100644 --- a/security/security.c +++ b/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)