Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89068c57 authored by Al Viro's avatar Al Viro
Browse files

Take ima_file_free() to proper place. 



Hooks: Just Say No.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1e93d005

fs/file_table.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,7 @@ void __fput(struct file *file) 
	if (file->f_op && file->f_op->release)

	if (file->f_op && file->f_op->release)

		file->f_op->release(inode, file);

		file->f_op->release(inode, file);

	security_file_free(file);

	security_file_free(file);

	ima_file_free(file);

	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))

	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))

		cdev_put(inode->i_cdev);

		cdev_put(inode->i_cdev);

	fops_put(file->f_op);

	fops_put(file->f_op);

security/security.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -666,8 +666,6 @@ int security_file_alloc(struct file *file) 
void security_file_free(struct file *file)

void security_file_free(struct file *file)

{

{

	security_ops->file_free_security(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)

int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)